DynamoDS
diff --git a/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+5-1Lines changed: 5 additions & 1 deletion b/‎src/DynamoCoreWpf/DynamoCoreWpf.csproj
Copy file name to clipboard
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.Designer.cs
Copy file name to clipboard
+18Lines changed: 18 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.en-US.resx
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎src/DynamoCoreWpf/Properties/Resources.resx
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/DynamoCoreWpf/UI/Images/PackageManager/close_16_16.png
Copy file name to clipboard
246 Bytes b/‎src/DynamoCoreWpf/UI/Images/PackageManager/close_16_16.png
Copy file name to clipboard
246 Bytes
diff --git a/‎src/DynamoCoreWpf/UI/Images/PackageManager/down_16_16.png
Copy file name to clipboard
261 Bytes b/‎src/DynamoCoreWpf/UI/Images/PackageManager/down_16_16.png
Copy file name to clipboard
261 Bytes
diff --git a/‎src/DynamoCoreWpf/UI/Images/PackageManager/folder_16_16.png
Copy file name to clipboard
365 Bytes b/‎src/DynamoCoreWpf/UI/Images/PackageManager/folder_16_16.png
Copy file name to clipboard
365 Bytes
diff --git a/‎src/DynamoCoreWpf/UI/Images/PackageManager/up_16_16.png
Copy file name to clipboard
252 Bytes b/‎src/DynamoCoreWpf/UI/Images/PackageManager/up_16_16.png
Copy file name to clipboard
252 Bytes
diff --git a/‎src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
Copy file name to clipboard
+45-2Lines changed: 45 additions & 2 deletions b/‎src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
Copy file name to clipboard
+45-2Lines changed: 45 additions & 2 deletions
diff --git a/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
Copy file name to clipboard
-20Lines changed: 0 additions & 20 deletions b/‎src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
Copy file name to clipboard
-20Lines changed: 0 additions & 20 deletions
@@ -79,7 +79,7 @@
 	</Reference>
     <Reference Include="ProtoGeometry, Version=2.12.0.5264, Culture=neutral, processorArchitecture=AMD64">
       <HintPath>..\packages\DynamoVisualProgramming.LibG_227_0_0.2.12.0.5264\lib\net48\ProtoGeometry.dll</HintPath>
-        <Private>False</Private>
+      <Private>False</Private>
     </Reference>
     <Reference Include="RestSharp, Version=105.2.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll</HintPath>
@@ -1308,6 +1308,10 @@
     <Resource Include="UI\Images\profile_normal.png" />
   </ItemGroup>
   <ItemGroup>
+    <Resource Include="UI\Images\PackageManager\close_16_16.png" />
+    <Resource Include="UI\Images\PackageManager\down_16_16.png" />
+    <Resource Include="UI\Images\PackageManager\folder_16_16.png" />
+    <Resource Include="UI\Images\PackageManager\up_16_16.png" />
     <EmbeddedResource Include="Controls\Docs\NodeAutocompleteDocumentation.html" />
     <Content Include="sharpdx_direct3d11_effects_x64.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 
@@ -2420,6 +2420,12 @@ Uninstall the following packages: {0}?</value>
   <data name="PreferencesPackageManagerSettingsTab" xml:space="preserve">
     <value>Package Manager</value>
   </data>
+  <data name="PackagePathAddPathButtonName" xml:space="preserve">
+    <value>Add Paths</value>
+  </data>
+  <data name="PackagePathPreferencesTitle" xml:space="preserve">
+    <value>Package/Library Search Paths</value>
+  </data>
   <data name="PreferencesViewShowRunPreviewTooltip" xml:space="preserve">
     <value>Switchable only when the current workspace is in Manual run mode.</value>
   </data>
 
@@ -2420,6 +2420,12 @@ Uninstall the following packages: {0}?</value>
   <data name="PreferencesPackageManagerSettingsTab" xml:space="preserve">
     <value>Package Manager</value>
   </data>
+  <data name="PackagePathAddPathButtonName" xml:space="preserve">
+    <value>Add Paths</value>
+  </data>
+  <data name="PackagePathPreferencesTitle" xml:space="preserve">
+    <value>Package/Library Search Paths</value>
+  </data>
   <data name="PreferencesViewShowRunPreviewTooltip" xml:space="preserve">
     <value>Switchable only when the current workspace is in Manual run mode.</value>
   </data>
 
@@ -547,6 +547,8 @@
         </Setter>
     </Style>
 
+
+
     <Style x:Key="SDarkTextBox"
            BasedOn="{StaticResource {x:Type TextBox}}"
            TargetType="{x:Type TextBox}">
@@ -2266,6 +2268,8 @@
 
     <SolidColorBrush x:Key="PreferencesWindowBackgroundColor" 
                              Color="#535353" />
+    <SolidColorBrush x:Key="PreferencesWindowItemDarkerBackgroundColor"
+                     Color="#353535"/>
     <SolidColorBrush x:Key="PreferencesWindowFontColor" 
                              Color="#E5E5E5" />
     <SolidColorBrush x:Key="PreferencesWindowButtonColor" 
@@ -2299,6 +2303,25 @@
     <!--White Window Color for borders-->
     <Color x:Key="PreferencesToogleBorderColor" R="255" G="255" B="255" A="255"/>
 
+    <Style x:Key="DarkTextBlock"
+           TargetType="TextBlock">
+        <Setter Property="FontSize"
+                Value="12">
+        </Setter>
+        <Setter Property="TextTrimming"
+            Value="CharacterEllipsis">
+        </Setter>
+    </Style>
+
+    <Style x:Key="PreferenceTitleLabelStyle"
+            TargetType="{x:Type Label}">
+        <Setter Property="Foreground"
+                Value="{StaticResource PreferencesWindowFontColor}">
+        </Setter>
+        <Setter Property="FontSize"
+                Value="14">
+        </Setter>
+    </Style>
 
     <Style x:Key="CaptionButtonStyleClose" 
                    TargetType="Button">
@@ -2445,10 +2468,19 @@
             </Trigger>
         </ControlTemplate.Triggers>
     </ControlTemplate>
-
+    
+    <DataTemplate x:Key="expanderHeader">
+        <TextBlock
+            Text="{Binding}" 
+            FontSize="14"
+            FontWeight="Medium">
+        </TextBlock>
+    </DataTemplate>
+    
     <Style TargetType="Expander" x:Key="MenuExpanderStyle">
         <Setter Property="Background" Value="{StaticResource SecondaryGray}"/>
         <Setter Property="Foreground" Value="{StaticResource PreferencesWindowFontColor}"/>
+        <Setter Property="HeaderTemplate" Value="{StaticResource expanderHeader}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <!-- Control template for expander -->
@@ -2482,10 +2514,14 @@
         </Setter>
     </Style>
 
+
+
+
     <!-- This expander style is similar to the MenuExpanderStyle and the only difference is the left-margin spacing -->
     <Style TargetType="Expander" x:Key="WorkspaceReferencesExpanderStyle">
         <Setter Property="Background" Value="{StaticResource SecondaryGray}"/>
         <Setter Property="Foreground" Value="{StaticResource PreferencesWindowFontColor}"/>
+        <Setter Property="HeaderTemplate" Value="{StaticResource expanderHeader}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <!-- Control template for expander -->
@@ -3223,10 +3259,17 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+    
+    
 
     <!--This Style will be used for the small trash icon button that appears when a new Style is created in the Visual Settings tab-->
-    <Style x:Key="RemoveStyleButtonStyle" 
+    <Style x:Key="FlatIconButtonStyle" 
            TargetType="{x:Type Button}">
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Opacity" Value=".5" />
+            </Trigger>
+        </Style.Triggers>
         <Setter Property="Background" 
                 Value="Transparent"/>
         <Setter Property="Template">
 
@@ -103,11 +103,6 @@ internal PreferencesViewModel PreferencesViewModel
             {
                 return preferencesViewModel;
             }
-            set
-            {
-                preferencesViewModel = value;
-                RaisePropertyChanged(nameof(PreferencesViewModel));
-            }
         }
 
         public Point TransformOrigin
@@ -1704,21 +1699,6 @@ internal bool CanShowPackageManagerSearch(object parameters)
             return true;
         }
 
-        private void ShowInstalledPackages(object parameters)
-        {
-            OnRequestManagePackagesDialog(this, EventArgs.Empty);
-        }
-
-        private bool CanShowInstalledPackages(object parameters)
-        {
-            return true;
-        }
-
-        private void ManagePackagePaths(object parameters)
-        {
-            OnRequestPackagePathsDialog(this, EventArgs.Empty);
-        }
-
         /// <summary>
         ///     Change the currently visible workspace to a custom node's workspace
         /// </summary>