diff --git a/DockingTools/CmdClass.cs b/DockingTools/CmdClass.cs
index 55762e9dedcc657046712e17c591ed59d7626065..11b434e4ed5f03218236269644e765472e864b85 100644
--- a/DockingTools/CmdClass.cs
+++ b/DockingTools/CmdClass.cs
@@ -42,17 +42,20 @@
     }
     public static partial class WpfStartUp
     {
+        public static DockingFrmViewModel FrmViewModel = Methods.LoadCommandFile($"{Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)}\\Cmd.xml");
+        public static DockingFrm dfrm;
         public static PaletteSet PSet { get; set; } = null;
         public static void TbPalette()
         {
             if (PSet == null || PSet.Visible == false)
             {
+                dfrm = new DockingFrm() { DataContext = FrmViewModel };
                 PSet = new PaletteSet("ToolBox");
                 ElementHost host = new()
                 {
                     AutoSize = true,
                     Dock = DockStyle.Fill,
-                    Child = new DockingFrm()
+                    Child = dfrm
                 };
                 PSet.Add("屏幕菜单", host);
                 PSet.Visible = true;
diff --git a/DockingTools/DockingFrm.xaml b/DockingTools/DockingFrm.xaml
index 8790abc0e9144648eba4b28fae719ce93499931f..51b309030d13eade4a15edbb355012a6b9f481ec 100644
--- a/DockingTools/DockingFrm.xaml
+++ b/DockingTools/DockingFrm.xaml
@@ -1,4 +1,9 @@
-<UserControl x:Class="DockingTools.DockingFrm" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:DockingTools" mc:Ignorable="d" MinWidth="110" MinHeight="50" d:DesignHeight="500" Width="110" Background="#59CAEACE">
+<UserControl
+    x:Class="DockingTools.DockingFrm" 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:eb="clr-namespace:DockingTools.NFox" xmlns:local="clr-namespace:DockingTools"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Width="110" MinWidth="110"
+    MinHeight="50" d:DesignHeight="500" Background="#59CAEACE"
+    mc:Ignorable="d">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -6,23 +11,30 @@
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
-    <ScrollViewer Margin="0" VerticalScrollBarVisibility="Visible">
+    <ScrollViewer Margin="0" VerticalScrollBarVisibility="Hidden">
         <ScrollViewer.Content>
-            <ItemsControl x:Name="ItemEX" Background="#59CAEACE" ItemsSource="{Binding ExLst}">
+            <ItemsControl x:Name="ItemExpad" ItemsSource="{Binding ExpanderLst, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
                 <ItemsControl.ItemTemplate>
                     <DataTemplate>
-                        <Expander Header="{Binding Path=Key}">
-                            <ItemsControl ItemsSource="{Binding Path=Value}">
-                                <ItemsControl.ItemTemplate>
-                                    <DataTemplate>
-                                        <Button Content="{Binding BtnStr}" Tag="{Binding BtnKey}" Height="19" />
-                                    </DataTemplate>
-                                </ItemsControl.ItemTemplate>
-                            </ItemsControl>
+                        <Expander Expanded="{eb:EventBinding Command=ExpandedCommand}" Header="{Binding ExHeader, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" IsExpanded="{Binding IsExOpen, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                            <StackPanel>
+                                <ItemsControl ItemsSource="{Binding ButtonCmds, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                    <ItemsControl.ItemTemplate>
+                                        <DataTemplate>
+                                            <Button
+                                                Margin="2"
+                                                Command="{Binding ClickCommand}"
+                                                Content="{Binding NameStr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                                Tag="{Binding CmdStr, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+                                        </DataTemplate>
+                                    </ItemsControl.ItemTemplate>
+                                </ItemsControl>
+                            </StackPanel>
                         </Expander>
                     </DataTemplate>
                 </ItemsControl.ItemTemplate>
             </ItemsControl>
+
         </ScrollViewer.Content>
     </ScrollViewer>
 </UserControl>
\ No newline at end of file
diff --git a/DockingTools/DockingFrm.xaml.cs b/DockingTools/DockingFrm.xaml.cs
index 2b3c17e17e8f649eb0ddf70013c4ce118aa2233f..db6d2ba08fc16088aec8ae18d6b2e5aaada5388d 100644
--- a/DockingTools/DockingFrm.xaml.cs
+++ b/DockingTools/DockingFrm.xaml.cs
@@ -5,12 +5,10 @@
     /// </summary>
     public partial class DockingFrm : System.Windows.Controls.UserControl
     {
-        public DockingFrmViewModel FrmViewModel = new();
+        
         public DockingFrm()
         {
-            FrmViewModel.LoadCommandFile($"{Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)}\\Cmd.xml");
             InitializeComponent();
-            DataContext = FrmViewModel;
         }
     }
 }
\ No newline at end of file
diff --git a/DockingTools/DockingFrmViewModel.cs b/DockingTools/DockingFrmViewModel.cs
index 5d0be46b878f7497c7a0505c60efd564b868f991..1b4761e862ab379ac5e4353d62a0026bc40be864 100644
--- a/DockingTools/DockingFrmViewModel.cs
+++ b/DockingTools/DockingFrmViewModel.cs
@@ -1,40 +1,97 @@
-
-
-namespace DockingTools
+namespace DockingTools
 {
-    public class ExItem : ViewModelBase
+    public class ExpanderItem : ViewModelBase
     {
-        private string btnKey;
+        private string _ExHeader;
+
+        public string ExHeader
+        {
+            get { return _ExHeader; }
+            set { SetProperty(ref _ExHeader, value); }
+        }
+
+        private bool _IsExOpen;
 
-        public string BtnKey
+        public bool IsExOpen
         {
-            get { return btnKey; }
-            set { SetProperty(ref btnKey, value); }
+            get { return _IsExOpen; }
+            set { SetProperty(ref _IsExOpen, value); }
         }
 
-        private string btnStr;
+        private ObservableCollection<NameCmd> _ButtonCmds = new();
 
-        public string BtnStr
+        public ObservableCollection<NameCmd> ButtonCmds
         {
-            get { return btnStr; }
-            set { SetProperty(ref btnStr, value); }
+            get { return _ButtonCmds; }
+            set { SetProperty(ref _ButtonCmds, value); }
+        }
+        public ExpanderItem(string exheader)
+        {
+            ExHeader = exheader;
         }
         /// <summary>
-        /// 按钮单击
+        /// 展开
         /// </summary>
-        private RelayCommand<string> clickCommand;
-        public RelayCommand<string> ClickCommand
+        private RelayCommand expandedCommand;
+        public RelayCommand ExpandedCommand
         {
             get
             {
-                if (clickCommand == null)
+                expandedCommand ??= new RelayCommand(execute =>
                 {
-                    clickCommand = new RelayCommand<string>(tag =>
+                    if (WpfStartUp.FrmViewModel.ExpanderLst != null)
                     {
-                        CadApp.DocumentManager.MdiActiveDocument.SendStringToExecute("\u001b\u001b" + BtnKey + "\n", true, false, false);
-                    },
+                        foreach (ExpanderItem exItem in WpfStartUp.FrmViewModel.ExpanderLst)
+                        {
+                            if (!exItem.ExHeader.Equals(this.ExHeader))
+                            {
+                                exItem.IsExOpen = false;
+                            }
+                        }
+                    }
+                },
+                    o => { return true; });
+                return expandedCommand;
+            }
+        }
+    }
+
+    public class NameCmd : ViewModelBase
+    {
+        private string _NameStr;
+
+        public string NameStr
+        {
+            get { return _NameStr; }
+            set { SetProperty(ref _NameStr, value); }
+        }
+
+        private string _CmdStr;
+
+        public string CmdStr
+        {
+            get { return _CmdStr; }
+            set { SetProperty(ref _CmdStr, value); }
+        }
+        public NameCmd(string namestr, string cmdstr)
+        {
+            this._NameStr = namestr;
+            this._CmdStr = cmdstr;
+        }
+        /// <summary>
+        /// 按钮单击
+        /// </summary>
+        private RelayCommand clickCommand;
+        public RelayCommand ClickCommand
+        {
+            get
+            {
+                clickCommand ??= new RelayCommand(execute =>
+                {
+                   // System.Windows.Forms.MessageBox.Show(NameStr);
+                    CadApp.DocumentManager.MdiActiveDocument.SendStringToExecute("\u001b\u001b" + CmdStr + "\n", true, false, false);
+                },
                     o => { return true; });
-                }
                 return clickCommand;
             }
         }
@@ -42,16 +99,33 @@ namespace DockingTools
 
     public class DockingFrmViewModel : ViewModelBase
     {
-        private Dictionary<string, ObservableCollection<ExItem>> exLst = new();
+        private ObservableCollection<ExpanderItem> _ExpanderLst = new();
+
+        public ObservableCollection<ExpanderItem> ExpanderLst
+        {
+            get { return _ExpanderLst; }
+            set { SetProperty(ref _ExpanderLst, value); }
+        }
+        private string _KeyWordStr;
 
-        public Dictionary<string, ObservableCollection<ExItem>> ExLst
+        public string KeyWordStr
         {
-            get { return exLst; }
-            set { SetProperty(ref exLst, value); }
+            get { return _KeyWordStr; }
+            set { SetProperty(ref _KeyWordStr, value); }
         }
+        private ObservableCollection<NameCmd> _HistoryCmds;
 
-        public void LoadCommandFile(string file)
+        public ObservableCollection<NameCmd> HistoryCmds
         {
+            get { return _HistoryCmds; }
+            set { SetProperty(ref _HistoryCmds, value); }
+        }
+    }
+    public static class Methods
+    {
+        public static DockingFrmViewModel LoadCommandFile(string file)
+        {
+            var dfm = new DockingFrmViewModel();
             if (File.Exists(file))
             {
                 try
@@ -60,36 +134,33 @@ namespace DockingTools
                     doc.Load(file);
                     XmlNode root = doc.SelectSingleNode("ScreenMenu");
                     XmlNodeList personNodes = root.ChildNodes;
-                    string exTitle = string.Empty;
+                    dfm.ExpanderLst = new();
                     foreach (XmlNode exNode in personNodes)
                     {
                         if (exNode.Name.ToLower() == "group" && exNode.Attributes.Count >= 1 && exNode.Attributes[0].Name.ToLower() == "title")
                         {
-                            exTitle = exNode.Attributes[0].Value;
-                            ObservableCollection<ExItem> eis = new();
+                            var ei = new ExpanderItem(exNode.Attributes[0].Value)
+                            {
+                                ButtonCmds = new ObservableCollection<NameCmd>()
+                            };
                             if (exNode.HasChildNodes)
                             {
                                 foreach (XmlNode btnode in exNode)
                                 {
-                                    ExItem ei = new();
                                     if (btnode.InnerText != string.Empty && btnode.Name.ToLower() == "item")
                                     {
-                                        ei.BtnStr = btnode.InnerText;
-                                        string command = string.Empty;
-                                        if (btnode.Attributes[0].Name.ToLower() == "command" && command == string.Empty)
-                                        {
-                                            ei.BtnKey = btnode.Attributes[0].Value;
-                                        }
+                                        if (btnode.Attributes[0].Name.ToLower() == "command")
+                                            ei.ButtonCmds.Add(new NameCmd(btnode.InnerText, btnode.Attributes[0].Value));
                                     }
-                                    eis.Add(ei);
                                 }
                             }
-                            ExLst.Add(exTitle, eis);
+                            dfm.ExpanderLst.Add(ei);
                         }
                     }
                 }
-                catch { }
+                catch { System.Windows.MessageBox.Show("出错了！"); }
             }
+            return dfm;
         }
     }
 }
diff --git a/DockingTools/DockingToolsAC.csproj b/DockingTools/DockingToolsAC.csproj
index d1a9be826e6d748bb1c8ff05e52af849cb802a86..7456f14c3d0892b63f17b4f59acf50d13d08ba94 100644
--- a/DockingTools/DockingToolsAC.csproj
+++ b/DockingTools/DockingToolsAC.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 	<PropertyGroup>
 		<LangVersion>preview</LangVersion>
-		<TargetFrameworks>NET45;NET46;NET48</TargetFrameworks>
+		<TargetFrameworks>NET48</TargetFrameworks>
 		<!-- 支持wpf -->
 		<UseWpf>true</UseWpf>
 		<!-- 支持winform -->
@@ -14,11 +14,6 @@
 		<OutputPath>bin\Debug\</OutputPath>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|NET45|AnyCPU'">
-		<DefineConstants>DEBUG;TRACE</DefineConstants>
-		<DefineConstants>TRACE;DEBUG;Debug</DefineConstants>
-	</PropertyGroup>
-
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|NET46|AnyCPU'">
 		<DefineConstants>DEBUG;TRACE</DefineConstants>
 		<DefineConstants>$(Configuration)</DefineConstants>
@@ -28,34 +23,11 @@
 		<DefineConstants>DEBUG;TRACE</DefineConstants>
 		<DefineConstants>$(Configuration)</DefineConstants>
 	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|NET45|AnyCPU'">
-		<DefineConstants>TRACE</DefineConstants>										 
-	</PropertyGroup>																	 
-																						 
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|NET46|AnyCPU'">
-		<DefineConstants>TRACE</DefineConstants>										  
-	</PropertyGroup>																	  
 																						  
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|NET48|AnyCPU'">
 		<DefineConstants>TRACE</DefineConstants>
 	</PropertyGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'NET45'">
-		<PackageReference Include="AutoCad.Net.2015-JingBox" Version="1.0.0">
-			<ExcludeAssets>runtime</ExcludeAssets>
-		</PackageReference>
-		<PackageReference Include="ZWCad.Net.2014" Version="1.0.2">
-			<ExcludeAssets>runtime</ExcludeAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<ItemGroup Condition="'$(TargetFramework)' == 'NET46'">
-		<PackageReference Include="AutoCad.Net.2017-JingBox" Version="1.0.0">
-			<ExcludeAssets>runtime</ExcludeAssets>
-		</PackageReference>
-	</ItemGroup>
-
 	<ItemGroup Condition="'$(TargetFramework)' == 'NET48'">
 		<PackageReference Include="AutoCad.Net.2021-JingBox" Version="1.0.0">
 			<ExcludeAssets>runtime</ExcludeAssets>
@@ -91,6 +63,6 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/DockingTools/DockingToolsGC.csproj b/DockingTools/DockingToolsGC.csproj
index 5bf58904ba827b5f70d161a0c454834b17f1f5bc..33fa0484b2aa8a36c652f99cc2ab5955992e4cb8 100644
--- a/DockingTools/DockingToolsGC.csproj
+++ b/DockingTools/DockingToolsGC.csproj
@@ -59,6 +59,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/DockingTools/DockingToolsZC.csproj b/DockingTools/DockingToolsZC.csproj
index b02b2a7abcb34e4048b738dbf169e35e96379752..c23f4ac69d3812b55f070ebafb89dc15f6091b1f 100644
--- a/DockingTools/DockingToolsZC.csproj
+++ b/DockingTools/DockingToolsZC.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 	<PropertyGroup>
 		<LangVersion>preview</LangVersion>
-		<TargetFrameworks>NET45;NET48</TargetFrameworks>
+		<TargetFrameworks>NET48</TargetFrameworks>
 		<!--NET46;-->
 		<!-- 支持wpf -->
 		<UseWpf>true</UseWpf>
@@ -14,12 +14,7 @@
 		<!--输出路径-->
 		<OutputPath>bin\Debug\</OutputPath>
 	</PropertyGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|NET45|AnyCPU'">
-		<DefineConstants>DEBUG;TRACE</DefineConstants>
-		<DefineConstants>TRACE;DEBUG;Debug;ZCAD</DefineConstants>
-	</PropertyGroup>
-
+	
 	<!--<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|NET46|AnyCPU'">
 		<DefineConstants>DEBUG;TRACE</DefineConstants>
 		<DefineConstants>TRACE;DEBUG;Debug;ZCAD</DefineConstants>
@@ -30,10 +25,6 @@
 		<DefineConstants>$(Configuration);ZCAD</DefineConstants>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|NET45|AnyCPU'">
-		<DefineConstants>TRACE;ZCAD</DefineConstants>
-	</PropertyGroup>
-
 	<!--<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|NET46|AnyCPU'">
 		<DefineConstants>TRACE;ZCAD</DefineConstants>
 	</PropertyGroup>-->
@@ -41,16 +32,7 @@
 	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|NET48|AnyCPU'">
 		<DefineConstants>TRACE;ZCAD</DefineConstants>
 	</PropertyGroup>
-
-	<ItemGroup Condition="'$(TargetFramework)' == 'NET45'">
-		<PackageReference Include="AutoCad.Net.2015-JingBox" Version="1.0.0">
-			<ExcludeAssets>runtime</ExcludeAssets>
-		</PackageReference>
-		<PackageReference Include="ZWCad.Net.2014" Version="1.0.2">
-			<ExcludeAssets>runtime</ExcludeAssets>
-		</PackageReference>
-	</ItemGroup>
-
+	
 	<!--<ItemGroup Condition="'$(TargetFramework)' == 'NET46'">
 		<PackageReference Include="AutoCad.Net.2017-JingBox" Version="1.0.0">
 			<ExcludeAssets>runtime</ExcludeAssets>
@@ -92,6 +74,6 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/DockingTools/Styles/Styles.xaml b/DockingTools/Styles/Styles.xaml
index 91cdbae1b3212689b371d44c7927c32a72b46c2d..74a8d3c7eb57d31489067c82af789d419eb3c762 100644
--- a/DockingTools/Styles/Styles.xaml
+++ b/DockingTools/Styles/Styles.xaml
@@ -1,44 +1,39 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Style TargetType="Expander">
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Expander">
-                    <Border x:Name="topborder"
-                            BorderBrush="#FF219352"
-                            BorderThickness="1"
-                            Background="{TemplateBinding Background}"
-                            CornerRadius="3"
-                            SnapsToDevicePixels="True">
+                    <Border
+                        x:Name="topborder"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="#FF219352" BorderThickness="1" CornerRadius="3"
+                        SnapsToDevicePixels="True">
                         <DockPanel>
-                            <ToggleButton x:Name="HeaderSite"
-                                          ContentTemplate="{TemplateBinding HeaderTemplate}"
-                                          Content="{TemplateBinding Header}"
-                                          DockPanel.Dock="Top"
-                                          Foreground="{TemplateBinding Foreground}"
-                                          FontWeight="{TemplateBinding FontWeight}"
-                                          FontStyle="{TemplateBinding FontStyle}"
-                                          FontStretch="{TemplateBinding FontStretch}"
-                                          FontSize="{TemplateBinding FontSize}"
-                                          FontFamily="{TemplateBinding FontFamily}"
-                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
-                                          Margin="1"
-                                          MinWidth="0"
-                                          MinHeight="0"
-                                          Padding="{TemplateBinding Padding}"
-                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <ToggleButton
+                                x:Name="HeaderSite" MinWidth="0" MinHeight="0"
+                                Margin="1"
+                                Padding="{TemplateBinding Padding}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Header}"
+                                ContentTemplate="{TemplateBinding HeaderTemplate}"
+                                DockPanel.Dock="Top"
+                                FontFamily="{TemplateBinding FontFamily}"
+                                FontSize="{TemplateBinding FontSize}"
+                                FontStretch="{TemplateBinding FontStretch}"
+                                FontStyle="{TemplateBinding FontStyle}"
+                                FontWeight="{TemplateBinding FontWeight}"
+                                Foreground="{TemplateBinding Foreground}"
+                                IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
                                 <ToggleButton.FocusVisualStyle>
                                     <Style>
                                         <Setter Property="Control.Template">
                                             <Setter.Value>
                                                 <ControlTemplate>
                                                     <Border>
-                                                        <Rectangle Margin="0"
-                                                                   SnapsToDevicePixels="True"
-                                                                   Stroke="Black"
-                                                                   StrokeThickness="1"
-                                                                   StrokeDashArray="1 2" />
+                                                        <Rectangle
+                                                            Margin="0" SnapsToDevicePixels="True" Stroke="Black"
+                                                            StrokeDashArray="1 2" StrokeThickness="1" />
                                                     </Border>
                                                 </ControlTemplate>
                                             </Setter.Value>
@@ -50,92 +45,50 @@
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate TargetType="{x:Type ToggleButton}">
-                                                    <Border x:Name="BoderLabel"
-                                                            Margin="0"
-                                                            Padding="0"
-                                                            CornerRadius="5"
-                                                            Background="#19219352">
-                                                        <Grid Background="Transparent"
-                                                              SnapsToDevicePixels="False">
+                                                    <Border
+                                                        x:Name="BoderLabel" Margin="0" Padding="0"
+                                                        Background="#19219352" CornerRadius="5">
+                                                        <Grid Background="Transparent" SnapsToDevicePixels="False">
                                                             <Grid.ColumnDefinitions>
                                                                 <ColumnDefinition Width="19" />
                                                                 <ColumnDefinition Width="*" />
                                                             </Grid.ColumnDefinitions>
-                                                            <Path Width="19"
-                                                                  Height="19"
-                                                                  x:Name="arrow"
-                                                                  Fill="#FF219352"
-                                                                  Data="M 4.5,3 L 4.5,16 A 2,2 135.4272 0 0 7.92,17.4 L 13.64,11.61 A 3,3 89.1456 0 0 13.64,7.39 L 7.92,1.6 A 2,2 135.4272 0 0 4.5,3"
-                                                                  HorizontalAlignment="Center"
-                                                                  SnapsToDevicePixels="False"
-                                                                  Stroke="#FF219352"
-                                                                  StrokeThickness="2"
-                                                                  VerticalAlignment="Center" />
-                                                            <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}"
-                                                                              Content="{TemplateBinding Content}"
-                                                                              Grid.Column="1"
-                                                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                                              HorizontalAlignment="Left"
-                                                                              Margin="4,0,0,0"
-                                                                              RecognizesAccessKey="True"
-                                                                              SnapsToDevicePixels="True"
-                                                                              VerticalAlignment="Center" />
+                                                            <Path
+                                                                x:Name="arrow" Width="19" Height="19"
+                                                                HorizontalAlignment="Center" VerticalAlignment="Center" Data="M 4.5,3 L 4.5,16 A 2,2 135.4272 0 0 7.92,17.4 L 13.64,11.61 A 3,3 89.1456 0 0 13.64,7.39 L 7.92,1.6 A 2,2 135.4272 0 0 4.5,3"
+                                                                Fill="#FF219352" SnapsToDevicePixels="False" Stroke="#FF219352"
+                                                                StrokeThickness="2" />
+                                                            <ContentPresenter
+                                                                Grid.Column="1" Margin="4,0,0,0" HorizontalAlignment="Left"
+                                                                VerticalAlignment="Center"
+                                                                Content="{TemplateBinding Content}"
+                                                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                                                RecognizesAccessKey="True" SnapsToDevicePixels="True" />
                                                         </Grid>
                                                     </Border>
                                                     <ControlTemplate.Triggers>
-                                                        <Trigger Property="IsChecked"
-                                                                 Value="True">
-                                                            <Setter Property="Data"
-                                                                    TargetName="arrow"
-                                                                    Value="M 12.68,3.49 L 3.49,12.68 A 2,2 135.4272 0 0 4.92,16.1 L 13.06,16.04 A 3,3 89.1456 0 0 16.04,13.06 L 16.1,4.9 A 2,2 135.4272 0 0 12.68,3.49" />
-                                                            <Setter Property="Fill"
-                                                                    TargetName="arrow"
-                                                                    Value="#FFFF4D2B" />
-                                                            <Setter Property="Stroke"
-                                                                    TargetName="arrow"
-                                                                    Value="#FFFF4D2B" />
-                                                            <Setter Property="Background"
-                                                                    TargetName="BoderLabel"
-                                                                    Value="#19F9320C" />
+                                                        <Trigger Property="IsChecked" Value="True">
+                                                            <Setter TargetName="arrow" Property="Data" Value="M 12.68,3.49 L 3.49,12.68 A 2,2 135.4272 0 0 4.92,16.1 L 13.06,16.04 A 3,3 89.1456 0 0 16.04,13.06 L 16.1,4.9 A 2,2 135.4272 0 0 12.68,3.49" />
+                                                            <Setter TargetName="arrow" Property="Fill" Value="#FFFF4D2B" />
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="#FFFF4D2B" />
+                                                            <Setter TargetName="BoderLabel" Property="Background" Value="#19F9320C" />
                                                         </Trigger>
-                                                        <Trigger Property="IsMouseOver"
-                                                                 Value="True">
-                                                            <Setter Property="Stroke"
-                                                                    TargetName="arrow"
-                                                                    Value="#FFA74CF9" />
-                                                            <Setter Property="Fill"
-                                                                    TargetName="arrow"
-                                                                    Value="#FFA74CF9" />
-                                                            <Setter Property="Background"
-                                                                    TargetName="BoderLabel"
-                                                                    Value="#197200DA" />
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="#FFA74CF9" />
+                                                            <Setter TargetName="arrow" Property="Fill" Value="#FFA74CF9" />
+                                                            <Setter TargetName="BoderLabel" Property="Background" Value="#197200DA" />
                                                         </Trigger>
-                                                        <Trigger Property="IsPressed"
-                                                                 Value="True">
-                                                            <Setter Property="Stroke"
-                                                                    TargetName="arrow"
-                                                                    Value="#FFFF4D2B" />
-                                                            <Setter Property="Fill"
-                                                                    TargetName="arrow"
-                                                                    Value="#FFFF4D2B" />
-                                                            <Setter Property="StrokeThickness"
-                                                                    TargetName="arrow"
-                                                                    Value="1.5" />
-                                                            <Setter Property="Background"
-                                                                    TargetName="BoderLabel"
-                                                                    Value="#19F9320C" />
+                                                        <Trigger Property="IsPressed" Value="True">
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="#FFFF4D2B" />
+                                                            <Setter TargetName="arrow" Property="Fill" Value="#FFFF4D2B" />
+                                                            <Setter TargetName="arrow" Property="StrokeThickness" Value="1.5" />
+                                                            <Setter TargetName="BoderLabel" Property="Background" Value="#19F9320C" />
                                                         </Trigger>
-                                                        <Trigger Property="IsEnabled"
-                                                                 Value="False">
-                                                            <Setter Property="Stroke"
-                                                                    TargetName="arrow"
-                                                                    Value="#FF76AE8E" />
-                                                            <Setter Property="Fill"
-                                                                    TargetName="arrow"
-                                                                    Value="#FF219352" />
-                                                            <Setter Property="Background"
-                                                                    TargetName="BoderLabel"
-                                                                    Value="Transparent" />
+                                                        <Trigger Property="IsEnabled" Value="False">
+                                                            <Setter TargetName="arrow" Property="Stroke" Value="#FF76AE8E" />
+                                                            <Setter TargetName="arrow" Property="Fill" Value="#FF219352" />
+                                                            <Setter TargetName="BoderLabel" Property="Background" Value="Transparent" />
                                                         </Trigger>
 
                                                     </ControlTemplate.Triggers>
@@ -145,36 +98,26 @@
                                     </Style>
                                 </ToggleButton.Style>
                             </ToggleButton>
-                            <ContentPresenter x:Name="ExpandSite"
-                                              ContentTemplate="{TemplateBinding ContentTemplate}"
-                                              Content="{TemplateBinding Content}"
-                                              ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                              DockPanel.Dock="Bottom"
-                                              Focusable="False"
-                                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                              Margin="{TemplateBinding Padding}"
-                                              Visibility="Collapsed"
-                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                            <ContentPresenter
+                                x:Name="ExpandSite"
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                DockPanel.Dock="Bottom" Focusable="False" Visibility="Collapsed" />
 
                         </DockPanel>
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsExpanded"
-                                 Value="True">
-                            <Setter Property="Visibility"
-                                    TargetName="ExpandSite"
-                                    Value="Visible" />
-                            <Setter Property="Background"
-                                    TargetName="topborder"
-                                    Value="#0CF9320C" />
-                            <Setter Property="BorderBrush"
-                                    TargetName="topborder"
-                                    Value="#FFFF4D2B" />
+                        <Trigger Property="IsExpanded" Value="True">
+                            <Setter TargetName="ExpandSite" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="topborder" Property="Background" Value="#0CF9320C" />
+                            <Setter TargetName="topborder" Property="BorderBrush" Value="#FFFF4D2B" />
                         </Trigger>
-                        <Trigger Property="IsEnabled"
-                                 Value="False">
-                            <Setter Property="Foreground"
-                                    Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -183,87 +126,50 @@
     </Style>
 
     <Style TargetType="{x:Type Button}">
-        <Setter Property="Command"
-                Value="{Binding ClickCommand}" />
-        <Setter Property="CommandParameter"
-                Value="{Binding RelativeSource={RelativeSource Mode=Self},Path=Tag}" />
+        <Setter Property="Command" Value="{Binding ClickCommand}" />
+        <Setter Property="CommandParameter" Value="{Binding RelativeSource={RelativeSource Mode=Self}, Path=Tag}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Button}">
-                    <Border x:Name="border"
-                            BorderBrush="Transparent"
-                            Background="Transparent"
-                            SnapsToDevicePixels="True">
-                        <ContentPresenter x:Name="contentPresenter"
-                                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                                          Content="{TemplateBinding Content}"
-                                          ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                          Focusable="False"
-                                          HorizontalAlignment="Center"
-                                          Margin="{TemplateBinding Padding}"
-                                          RecognizesAccessKey="True"
-                                          SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                          VerticalAlignment="Center" />
+                    <Border
+                        x:Name="border" Background="Transparent" BorderBrush="Transparent"
+                        SnapsToDevicePixels="True">
+                        <ContentPresenter
+                            x:Name="contentPresenter"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="Center" VerticalAlignment="Center"
+                            Content="{TemplateBinding Content}"
+                            ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Focusable="False" RecognizesAccessKey="True"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                     </Border>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsFocused"
-                                 Value="True">
-                            <Setter Property="BorderBrush"
-                                    TargetName="border"
-                                    Value="#B2002EFD" />
-                            <Setter Property="CornerRadius"
-                                    TargetName="border"
-                                    Value="2" />
-                            <Setter Property="BorderThickness"
-                                    TargetName="border"
-                                    Value="1" />
-                            <Setter Property="Background"
-                                    TargetName="border"
-                                    Value="#4C002EFD" />
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="#B2002EFD" />
+                            <Setter TargetName="border" Property="CornerRadius" Value="2" />
+                            <Setter TargetName="border" Property="BorderThickness" Value="1" />
+                            <Setter TargetName="border" Property="Background" Value="#4C002EFD" />
                         </Trigger>
-                        <Trigger Property="IsDefaulted"
-                                 Value="True">
-                            <Setter Property="BorderBrush"
-                                    TargetName="border"
-                                    Value="Transparent" />
+                        <Trigger Property="IsDefaulted" Value="True">
+                            <Setter TargetName="border" Property="BorderBrush" Value="Transparent" />
                         </Trigger>
-                        <Trigger Property="IsMouseOver"
-                                 Value="True">
-                            <Setter Property="Background"
-                                    TargetName="border"
-                                    Value="#4C7200DA" />
-                            <Setter Property="BorderBrush"
-                                    TargetName="border"
-                                    Value="#4C7200DA" />
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#4C7200DA" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="#4C7200DA" />
                         </Trigger>
-                        <Trigger Property="IsPressed"
-                                 Value="True">
-                            <Setter Property="Background"
-                                    TargetName="border"
-                                    Value="#4CF9320C" />
-                            <Setter Property="BorderBrush"
-                                    TargetName="border"
-                                    Value="#4CF9320C" />
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#4CF9320C" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="#4CF9320C" />
                         </Trigger>
-                        <Trigger Property="ToggleButton.IsChecked"
-                                 Value="True">
-                            <Setter Property="Background"
-                                    TargetName="border"
-                                    Value="#7F9095FB" />
-                            <Setter Property="BorderBrush"
-                                    TargetName="border"
-                                    Value="#7F9095FB" />
+                        <Trigger Property="ToggleButton.IsChecked" Value="True">
+                            <Setter TargetName="border" Property="Background" Value="#7F9095FB" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="#7F9095FB" />
                         </Trigger>
-                        <Trigger Property="IsEnabled"
-                                 Value="False">
-                            <Setter Property="Background"
-                                    TargetName="border"
-                                    Value="#FFF4F4F4" />
-                            <Setter Property="BorderBrush"
-                                    TargetName="border"
-                                    Value="#FFF4F4F4" />
-                            <Setter Property="Foreground"
-                                    Value="#FF838383" />
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter TargetName="border" Property="Background" Value="#FFF4F4F4" />
+                            <Setter TargetName="border" Property="BorderBrush" Value="#FFF4F4F4" />
+                            <Setter Property="Foreground" Value="#FF838383" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -295,7 +201,7 @@
     <Color x:Key="GlyphColor">#FF444444</Color>
     <Color x:Key="GlyphMouseOver">sc#1, 0.004391443, 0.002428215, 0.242281124</Color>
 
-    <!--Border colors-->
+    <!--  Border colors  -->
     <Color x:Key="BorderLightColor">#FF219352</Color>
     <Color x:Key="BorderMediumColor">#FF888888</Color>
     <Color x:Key="BorderDarkColor">#FF219352</Color>
@@ -308,129 +214,98 @@
 
     <Color x:Key="DefaultBorderBrushDarkColor">#FF219352</Color>
 
-    <!--Control-specific resources.-->
+    <!--  Control-specific resources.  -->
     <Color x:Key="HeaderTopColor">#FFC5CBF9</Color>
     <Color x:Key="DatagridCurrentCellBorderColor">#FF219352</Color>
     <Color x:Key="SliderTrackDarkColor">#FFC5CBF9</Color>
 
     <Color x:Key="NavButtonFrameColor">#FF219352</Color>
 
-    <LinearGradientBrush x:Key="MenuPopupBrush"
-                         EndPoint="0.5,1"
-                         StartPoint="0.5,0">
-        <GradientStop Color="{DynamicResource ControlLightColor}"
-                      Offset="0" />
-        <GradientStop Color="{DynamicResource ControlMediumColor}"
-                      Offset="0.5" />
-        <GradientStop Color="{DynamicResource ControlLightColor}"
-                      Offset="1" />
+    <LinearGradientBrush x:Key="MenuPopupBrush" StartPoint="0.5,0" EndPoint="0.5,1">
+        <GradientStop Offset="0" Color="{DynamicResource ControlLightColor}" />
+        <GradientStop Offset="0.5" Color="{DynamicResource ControlMediumColor}" />
+        <GradientStop Offset="1" Color="{DynamicResource ControlLightColor}" />
     </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="ProgressBarIndicatorAnimatedFill"
-                         StartPoint="0,0"
-                         EndPoint="1,0">
+    <LinearGradientBrush x:Key="ProgressBarIndicatorAnimatedFill" StartPoint="0,0" EndPoint="1,0">
         <LinearGradientBrush.GradientStops>
             <GradientStopCollection>
-                <GradientStop Color="#000000FF"
-                              Offset="0" />
-                <GradientStop Color="#FF219352"
-                              Offset="0.4" />
-                <GradientStop Color="#FF219352"
-                              Offset="0.6" />
-                <GradientStop Color="#000000FF"
-                              Offset="1" />
+                <GradientStop Offset="0" Color="#000000FF" />
+                <GradientStop Offset="0.4" Color="#FF219352" />
+                <GradientStop Offset="0.6" Color="#FF219352" />
+                <GradientStop Offset="1" Color="#000000FF" />
             </GradientStopCollection>
         </LinearGradientBrush.GradientStops>
     </LinearGradientBrush>
 
-    <Style x:Key="ScrollBarLineButton"
-           TargetType="{x:Type RepeatButton}">
-        <Setter Property="SnapsToDevicePixels"
-                Value="True" />
-        <Setter Property="OverridesDefaultStyle"
-                Value="true" />
-        <Setter Property="Focusable"
-                Value="false" />
+    <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 x:Name="Border"
-                            Margin="1"
-                            CornerRadius="2"
-                            BorderThickness="1">
+                    <Border
+                        x:Name="Border" Margin="1" BorderThickness="1"
+                        CornerRadius="2">
                         <Border.BorderBrush>
-                            <LinearGradientBrush StartPoint="0,0"
-                                                 EndPoint="0,1">
+                            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
                                 <LinearGradientBrush.GradientStops>
                                     <GradientStopCollection>
-                                        <GradientStop Color="{DynamicResource BorderMediumColor}"
-                                                      Offset="0.0" />
-                                        <GradientStop Color="{DynamicResource BorderDarkColor}"
-                                                      Offset="1.0" />
+                                        <GradientStop Offset="0.0" Color="{DynamicResource BorderMediumColor}" />
+                                        <GradientStop Offset="1.0" Color="{DynamicResource BorderDarkColor}" />
                                     </GradientStopCollection>
                                 </LinearGradientBrush.GradientStops>
                             </LinearGradientBrush>
                         </Border.BorderBrush>
                         <Border.Background>
-                            <LinearGradientBrush StartPoint="0,0"
-                                                 EndPoint="0,1">
+                            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
                                 <LinearGradientBrush.GradientStops>
                                     <GradientStopCollection>
                                         <GradientStop Color="{DynamicResource ControlLightColor}" />
-                                        <GradientStop Color="{DynamicResource ControlMediumColor}"
-                                                      Offset="1.0" />
+                                        <GradientStop Offset="1.0" Color="{DynamicResource ControlMediumColor}" />
                                     </GradientStopCollection>
                                 </LinearGradientBrush.GradientStops>
                             </LinearGradientBrush>
                         </Border.Background>
+                        <Path
+                            x:Name="Arrow" HorizontalAlignment="Center" VerticalAlignment="Center"
+                            Data="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}">
+                            <Path.Fill>
+                                <SolidColorBrush Color="{DynamicResource GlyphColor}" />
+                            </Path.Fill>
+                        </Path>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
                                 <VisualState x:Name="Normal" />
                                 <VisualState x:Name="MouseOver" />
                                 <VisualState x:Name="Pressed">
                                     <Storyboard>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border"
-                                                                      Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                            <EasingColorKeyFrame KeyTime="0"
-                                                                 Value="{StaticResource ControlPressedColor}" />
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
+                                            <EasingColorKeyFrame KeyTime="0" Value="{StaticResource ControlPressedColor}" />
                                         </ColorAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Disabled">
                                     <Storyboard>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Arrow"
-                                                                      Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
-                                            <EasingColorKeyFrame KeyTime="0"
-                                                                 Value="{StaticResource DisabledForegroundColor}" />
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="Arrow" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)">
+                                            <EasingColorKeyFrame KeyTime="0" Value="{StaticResource DisabledForegroundColor}" />
                                         </ColorAnimationUsingKeyFrames>
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        <Path x:Name="Arrow"
-                              HorizontalAlignment="Center"
-                              VerticalAlignment="Center"
-                              Data="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}">
-                            <Path.Fill>
-                                <SolidColorBrush Color="{DynamicResource GlyphColor}" />
-                            </Path.Fill>
-                        </Path>
                     </Border>
                 </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" />
+    <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}">
@@ -440,77 +315,58 @@
         </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" />
+    <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" />
+                    <Border
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="1" CornerRadius="2" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
 
-    <ControlTemplate x:Key="VerticalScrollBar"
-                     TargetType="{x:Type ScrollBar}">
+    <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="#597AC984" />
-            <RepeatButton Grid.Row="0"
-                          Style="{StaticResource ScrollBarLineButton}"
-                          Height="18"
-                          Command="ScrollBar.LineUpCommand"
-                          Content="M 0 4 L 8 4 L 4 0 Z" />
-            <Track x:Name="PART_Track"
-                   Grid.Row="1"
-                   IsDirectionReversed="true">
+            <Border Grid.RowSpan="3" Background="#597AC984" CornerRadius="2" />
+            <RepeatButton
+                Grid.Row="0" Height="18" Command="ScrollBar.LineUpCommand"
+                Content="M 0 4 L 8 4 L 4 0 Z"
+                Style="{StaticResource ScrollBarLineButton}" />
+            <Track x:Name="PART_Track" Grid.Row="1" IsDirectionReversed="true">
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Style="{StaticResource ScrollBarPageButton}"
-                                  Command="ScrollBar.PageUpCommand" />
+                    <RepeatButton Command="ScrollBar.PageUpCommand" Style="{StaticResource ScrollBarPageButton}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Thumb Style="{StaticResource ScrollBarThumb}"
-                           Margin="1,0,1,0">
+                    <Thumb Margin="1,0,1,0" Style="{StaticResource ScrollBarThumb}">
                         <Thumb.BorderBrush>
-                            <LinearGradientBrush StartPoint="0,0"
-                                                 EndPoint="1,0">
+                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
                                 <LinearGradientBrush.GradientStops>
                                     <GradientStopCollection>
-                                        <GradientStop Color="{DynamicResource BorderLightColor}"
-                                                      Offset="0.0" />
-                                        <GradientStop Color="{DynamicResource BorderDarkColor}"
-                                                      Offset="1.0" />
+                                        <GradientStop Offset="0.0" Color="{DynamicResource BorderLightColor}" />
+                                        <GradientStop Offset="1.0" Color="{DynamicResource BorderDarkColor}" />
                                     </GradientStopCollection>
                                 </LinearGradientBrush.GradientStops>
                             </LinearGradientBrush>
 
                         </Thumb.BorderBrush>
                         <Thumb.Background>
-                            <LinearGradientBrush StartPoint="0,0"
-                                                 EndPoint="1,0">
+                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
                                 <LinearGradientBrush.GradientStops>
                                     <GradientStopCollection>
-                                        <GradientStop Color="{DynamicResource ControlLightColor}"
-                                                      Offset="0.0" />
-                                        <GradientStop Color="{DynamicResource ControlMediumColor}"
-                                                      Offset="1.0" />
+                                        <GradientStop Offset="0.0" Color="{DynamicResource ControlLightColor}" />
+                                        <GradientStop Offset="1.0" Color="{DynamicResource ControlMediumColor}" />
                                     </GradientStopCollection>
                                 </LinearGradientBrush.GradientStops>
                             </LinearGradientBrush>
@@ -519,55 +375,42 @@
                     </Thumb>
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Style="{StaticResource ScrollBarPageButton}"
-                                  Command="ScrollBar.PageDownCommand" />
+                    <RepeatButton Command="ScrollBar.PageDownCommand" Style="{StaticResource ScrollBarPageButton}" />
                 </Track.IncreaseRepeatButton>
             </Track>
-            <RepeatButton Grid.Row="2"
-                          Style="{StaticResource ScrollBarLineButton}"
-                          Height="18"
-                          Command="ScrollBar.LineDownCommand"
-                          Content="M 0 0 L 4 4 L 8 0 Z" />
+            <RepeatButton
+                Grid.Row="2" Height="18" Command="ScrollBar.LineDownCommand"
+                Content="M 0 0 L 4 4 L 8 0 Z"
+                Style="{StaticResource ScrollBarLineButton}" />
         </Grid>
     </ControlTemplate>
 
-    <ControlTemplate x:Key="HorizontalScrollBar"
-                     TargetType="{x:Type ScrollBar}">
+    <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="#59CAEACE" />
-            <RepeatButton Grid.Column="0"
-                          Style="{StaticResource ScrollBarLineButton}"
-                          Width="18"
-                          Command="ScrollBar.LineLeftCommand"
-                          Content="M 4 0 L 4 8 L 0 4 Z" />
-            <Track x:Name="PART_Track"
-                   Grid.Column="1"
-                   IsDirectionReversed="False">
+            <Border Grid.ColumnSpan="3" Background="#59CAEACE" CornerRadius="2" />
+            <RepeatButton
+                Grid.Column="0" Width="18" Command="ScrollBar.LineLeftCommand"
+                Content="M 4 0 L 4 8 L 0 4 Z"
+                Style="{StaticResource ScrollBarLineButton}" />
+            <Track x:Name="PART_Track" Grid.Column="1" IsDirectionReversed="False">
                 <Track.DecreaseRepeatButton>
-                    <RepeatButton Style="{StaticResource ScrollBarPageButton}"
-                                  Command="ScrollBar.PageLeftCommand" />
+                    <RepeatButton Command="ScrollBar.PageLeftCommand" Style="{StaticResource ScrollBarPageButton}" />
                 </Track.DecreaseRepeatButton>
                 <Track.Thumb>
-                    <Thumb Style="{StaticResource ScrollBarThumb}"
-                           Margin="0,1,0,1">
+                    <Thumb Margin="0,1,0,1" Style="{StaticResource ScrollBarThumb}">
 
                         <Thumb.BorderBrush>
 
-                            <LinearGradientBrush StartPoint="0,0"
-                                                 EndPoint="1,0">
+                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
                                 <LinearGradientBrush.GradientStops>
                                     <GradientStopCollection>
-                                        <GradientStop Color="{DynamicResource BorderLightColor}"
-                                                      Offset="0.0" />
-                                        <GradientStop Color="{DynamicResource BorderDarkColor}"
-                                                      Offset="1.0" />
+                                        <GradientStop Offset="0.0" Color="{DynamicResource BorderLightColor}" />
+                                        <GradientStop Offset="1.0" Color="{DynamicResource BorderDarkColor}" />
                                     </GradientStopCollection>
                                 </LinearGradientBrush.GradientStops>
                             </LinearGradientBrush>
@@ -575,14 +418,11 @@
                         </Thumb.BorderBrush>
                         <Thumb.Background>
 
-                            <LinearGradientBrush StartPoint="0,0"
-                                                 EndPoint="0,1">
+                            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
                                 <LinearGradientBrush.GradientStops>
                                     <GradientStopCollection>
-                                        <GradientStop Color="{DynamicResource ControlLightColor}"
-                                                      Offset="0.0" />
-                                        <GradientStop Color="{DynamicResource ControlMediumColor}"
-                                                      Offset="1.0" />
+                                        <GradientStop Offset="0.0" Color="{DynamicResource ControlLightColor}" />
+                                        <GradientStop Offset="1.0" Color="{DynamicResource ControlMediumColor}" />
                                     </GradientStopCollection>
                                 </LinearGradientBrush.GradientStops>
                             </LinearGradientBrush>
@@ -591,52 +431,37 @@
                     </Thumb>
                 </Track.Thumb>
                 <Track.IncreaseRepeatButton>
-                    <RepeatButton Style="{StaticResource ScrollBarPageButton}"
-                                  Command="ScrollBar.PageRightCommand" />
+                    <RepeatButton Command="ScrollBar.PageRightCommand" Style="{StaticResource ScrollBarPageButton}" />
                 </Track.IncreaseRepeatButton>
             </Track>
-            <RepeatButton Grid.Column="2"
-                          Style="{StaticResource ScrollBarLineButton}"
-                          Width="18"
-                          Command="ScrollBar.LineRightCommand"
-                          Content="M 0 0 L 4 4 L 0 8 Z" />
+            <RepeatButton
+                Grid.Column="2" Width="18" Command="ScrollBar.LineRightCommand"
+                Content="M 0 0 L 4 4 L 0 8 Z"
+                Style="{StaticResource ScrollBarLineButton}" />
         </Grid>
     </ControlTemplate>
 
-    <Style x:Key="{x:Type ScrollBar}"
-           TargetType="{x:Type ScrollBar}">
-        <Setter Property="SnapsToDevicePixels"
-                Value="True" />
-        <Setter Property="OverridesDefaultStyle"
-                Value="true" />
+    <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="12" />
-                <Setter Property="Template"
-                        Value="{StaticResource HorizontalScrollBar}" />
+            <Trigger Property="Orientation" Value="Horizontal">
+                <Setter Property="Width" Value="Auto" />
+                <Setter Property="Height" Value="12" />
+                <Setter Property="Template" Value="{StaticResource HorizontalScrollBar}" />
             </Trigger>
-            <Trigger Property="Orientation"
-                     Value="Vertical">
-                <Setter Property="Width"
-                        Value="12" />
-                <Setter Property="Height"
-                        Value="Auto" />
-                <Setter Property="Template"
-                        Value="{StaticResource VerticalScrollBar}" />
+            <Trigger Property="Orientation" Value="Vertical">
+                <Setter Property="Width" Value="12" />
+                <Setter Property="Height" Value="Auto" />
+                <Setter Property="Template" Value="{StaticResource VerticalScrollBar}" />
             </Trigger>
         </Style.Triggers>
     </Style>
     <!--#endregion-->
 
     <Style TargetType="ItemsControl">
-        <Setter Property="Background"
-                Value="Transparent" />
-        <Setter Property="BorderBrush"
-                Value="Transparent" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>