diff --git a/src/DynamoCoreWpf/UI/Prompts/DynamoMessageBox.xaml.cs b/src/DynamoCoreWpf/UI/Prompts/DynamoMessageBox.xaml.cs
index 641f771cb9b..d9ad8e907d0 100644
--- a/src/DynamoCoreWpf/UI/Prompts/DynamoMessageBox.xaml.cs
+++ b/src/DynamoCoreWpf/UI/Prompts/DynamoMessageBox.xaml.cs
@@ -122,6 +122,31 @@ public static MessageBoxResult Show(string messageBoxText, string caption, Messa
             dynamoMessageBox.ShowDialog();
             return dynamoMessageBox.CustomDialogResult;
         }
+        /// <summary>
+        /// Displays a dialog to the user and returns their choice as a MessageBoxResult.
+        /// </summary>
+        /// <param name="owner">owner window</param>
+        /// <param name="messageBoxText"></param>
+        /// <param name="caption"></param>
+        /// <param name="button"></param>
+        /// <param name="icon"></param>
+        /// <returns></returns>
+        public static MessageBoxResult Show(Window owner,string messageBoxText, string caption, MessageBoxButton button,
+            MessageBoxImage icon)
+        {
+            var dynamoMessageBox = new DynamoMessageBox
+            {
+                BodyText = messageBoxText,
+                TitleText = caption,
+                MessageBoxButton = button,
+                MessageBoxImage = icon,
+                Owner = owner
+            };
+
+            dynamoMessageBox.ConfigureButtons(button);
+            dynamoMessageBox.ShowDialog();
+            return dynamoMessageBox.CustomDialogResult;
+        }
 
         /// <summary>
         /// Displays a dialog to the user and returns their choice as a MessageBoxResult.
diff --git a/src/DynamoCoreWpf/Utilities/MessageBoxUtilities.cs b/src/DynamoCoreWpf/Utilities/MessageBoxUtilities.cs
index 9b229b4c68d..bdbe8a30d29 100644
--- a/src/DynamoCoreWpf/Utilities/MessageBoxUtilities.cs
+++ b/src/DynamoCoreWpf/Utilities/MessageBoxUtilities.cs
@@ -10,6 +10,7 @@ internal class MessageBoxService {
         internal interface IMessageBox
         {
             MessageBoxResult Show(string msg, string title, MessageBoxButton button, MessageBoxImage img);
+            MessageBoxResult Show(Window owner,string msg, string title, MessageBoxButton button, MessageBoxImage img);
             MessageBoxResult Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img);
         }
 
@@ -21,6 +22,12 @@ MessageBoxResult IMessageBox.Show(string msg, string title, MessageBoxButton but
             {
                 return DynamoMessageBox.Show(msg, title, button, img);
             }
+
+            public MessageBoxResult Show(Window owner, string msg, string title, MessageBoxButton button, MessageBoxImage img)
+            {
+                return DynamoMessageBox.Show(owner,msg, title, button, img);
+            }
+
             MessageBoxResult IMessageBox.Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img)
             {
                 return DynamoMessageBox.Show(msg, title, button,buttonNames, img);
@@ -36,6 +43,10 @@ internal static MessageBoxResult Show(string msg, string title, MessageBoxButton
         {
             return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(msg, title, button, img);
         }
+        internal static MessageBoxResult Show(Window owner,string msg, string title, MessageBoxButton button, MessageBoxImage img)
+        {
+            return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(owner,msg, title, button, img);
+        }
         internal static MessageBoxResult Show(string msg, string title, MessageBoxButton button, IEnumerable<string> buttonNames, MessageBoxImage img)
         {
             return (msg_box ?? (msg_box = new DefaultMessageBox())).Show(msg, title, button, buttonNames, img);
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
index 6a3035e7f02..c7dea153482 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerClientViewModel.cs
@@ -187,6 +187,8 @@ public class PackageManagerClientViewModel : NotificationObject, IPackageInstall
 
         #region Properties/Fields
 
+        public PackageManagerSearchView Owner { get; set; }
+
         ObservableCollection<PackageUploadHandle> _uploads = new ObservableCollection<PackageUploadHandle>();
         public ObservableCollection<PackageUploadHandle> Uploads
         {
@@ -421,10 +423,11 @@ private void ShowNodePublishInfo(ICollection<Tuple<CustomNodeInfo, CustomNodeDef
 
                 if (pkg != null)
                 {
-                    var m = Dynamo.Wpf.Utilities.MessageBoxService.Show(String.Format(Resources.MessageSubmitSameNamePackage,
-                            DynamoViewModel.BrandingResourceProvider.ProductName, pkg.Name),
-                            Resources.PackageWarningMessageBoxTitle,
-                            MessageBoxButton.YesNo, MessageBoxImage.Question);
+                    var m = Dynamo.Wpf.Utilities.MessageBoxService.Show(Owner, 
+                        String.Format(Resources.MessageSubmitSameNamePackage,
+                        DynamoViewModel.BrandingResourceProvider.ProductName, pkg.Name),
+                        Resources.PackageWarningMessageBoxTitle,
+                        MessageBoxButton.YesNo, MessageBoxImage.Question);
 
                     if (m == MessageBoxResult.Yes)
                     {
@@ -520,7 +523,7 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                     {
                         var message = string.Format(Resources.MessageSamePackageSameVersInBuiltinPackages, packageToDownload);
 
-                        MessageBoxService.Show(message, Resources.CannotDownloadPackageMessageBoxTitle,
+                        MessageBoxService.Show(Owner, message, Resources.CannotDownloadPackageMessageBoxTitle,
                             MessageBoxButton.OK, MessageBoxImage.Information);
                     }
                     else
@@ -528,7 +531,7 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                         var message = string.Format(Resources.MessageSamePackageDiffVersInBuiltinPackages, packageToDownload, dupPkg,
                             DynamoViewModel.BrandingResourceProvider.ProductName);
 
-                        MessageBoxService.Show(message, Resources.CannotDownloadPackageMessageBoxTitle,
+                        MessageBoxService.Show(Owner, message, Resources.CannotDownloadPackageMessageBoxTitle,
                             MessageBoxButton.OK, MessageBoxImage.Exclamation);
                     }
                     Analytics.TrackEvent(Actions.BuiltInPackageConflict, Categories.PackageManagerOperations, packageToDownload);
@@ -538,7 +541,7 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                 if (package.version == duplicatePackage.VersionName)
                 {
                     var message = string.Format(Resources.MessageSamePackageSameVersInLocalPackages, packageToDownload);
-                    MessageBoxService.Show(message, Resources.CannotDownloadPackageMessageBoxTitle,
+                    MessageBoxService.Show(Owner, message, Resources.CannotDownloadPackageMessageBoxTitle,
                     MessageBoxButton.OK, MessageBoxImage.Information);
 
                     return false;
@@ -548,7 +551,7 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                     MessageBoxResult dialogResult;
 
                     if (duplicatePackage.InUse(DynamoViewModel.Model))
-                    {// Loaded assemblies or pacakge in use in workspace
+                    {// Loaded assemblies or package in use in workspace
                         dialogResult = MessageBoxService.Show(string.Format(Resources.MessageSamePackageDiffVersInLocalPackages, packageToDownload, dupPkg, DynamoViewModel.BrandingResourceProvider.ProductName),
                             Resources.LoadedPackagesConflictMessageBoxTitle,
                             MessageBoxButton.OKCancel, new string[] { Resources.UninstallLoadedPackage, Resources.GenericTaskDialogOptionCancel }, MessageBoxImage.Exclamation);
@@ -612,7 +615,7 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                 var message = string.Format(Resources.MessagePackageDepsInBuiltinPackages, packageToDownload,
                         JoinPackageNames(builtinPackages));
                 Analytics.TrackEvent(Actions.BuiltInPackageConflict, Categories.PackageManagerOperations, packageToDownload);
-                var dialogResult = MessageBoxService.Show(message,
+                var dialogResult = MessageBoxService.Show(Owner, message,
                     Resources.BuiltInPackageConflictMessageBoxTitle,
                     MessageBoxButton.OKCancel, MessageBoxImage.Exclamation);
 
@@ -625,7 +628,7 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                 var message = string.Format(Resources.MessageForceInstallOrUninstallToContinue, packageToDownload, conflictingPkgs,
                     DynamoViewModel.BrandingResourceProvider.ProductName);
                 
-                var dialogResult = MessageBoxService.Show(message,
+                var dialogResult = MessageBoxService.Show(Owner, message,
                     Resources.PackagesInUseConflictMessageBoxTitle,
                     MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
 
@@ -659,7 +662,7 @@ private bool WarnAboutDuplicatePackageConflicts(PackageVersion package,
                     DynamoViewModel.BrandingResourceProvider.ProductName,
                     JoinPackageNames(immediateUninstalls), packageToDownload);
 
-                var dialogResult = MessageBoxService.Show(message,
+                var dialogResult = MessageBoxService.Show(Owner, message,
                     Resources.DownloadWarningMessageBoxTitle, MessageBoxButton.OKCancel, MessageBoxImage.Warning);
                 if (dialogResult == MessageBoxResult.Cancel || dialogResult == MessageBoxResult.None)
                 {
@@ -675,7 +678,7 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                 String.Format(Resources.MessageConfirmToInstallPackage, name, package.version) :
                 String.Format(Resources.MessageConfirmToInstallPackageToFolder, name, package.version, installPath);
 
-            var result = MessageBoxService.Show(msg,
+            var result = MessageBoxService.Show(Owner, msg,
                 Resources.PackageDownloadConfirmMessageBoxTitle,
                 MessageBoxButton.OKCancel, MessageBoxImage.Question);
 
@@ -702,6 +705,7 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                     catch
                     {
                         MessageBoxService.Show(
+                            Owner,
                             String.Format(Resources.MessageFailedToDownloadPackageVersion, depVersion, dep._id),
                             Resources.PackageDownloadErrorMessageBoxTitle,
                             MessageBoxButton.OK, MessageBoxImage.Error);
@@ -792,7 +796,8 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                 // if any do, notify user and allow cancellation
                 if (containsBinariesOrPythonScripts)
                 {
-                    var res = MessageBoxService.Show(Resources.MessagePackageContainPythonScript,
+                    var res = MessageBoxService.Show(Owner, 
+                        Resources.MessagePackageContainPythonScript,
                         Resources.PackageDownloadMessageBoxTitle,
                         MessageBoxButton.OKCancel, MessageBoxImage.Exclamation);
 
@@ -808,7 +813,8 @@ internal async void ExecutePackageDownload(string name, PackageVersion package,
                 // allowing them to cancel the package download
                 if (futureDeps.Any())
                 {
-                    var res = MessageBoxService.Show(string.Format(Resources.MessagePackageNewerDynamo, DynamoViewModel.BrandingResourceProvider.ProductName),
+                    var res = MessageBoxService.Show(Owner,
+                        string.Format(Resources.MessagePackageNewerDynamo, DynamoViewModel.BrandingResourceProvider.ProductName),
                         string.Format(Resources.PackageUseNewerDynamoMessageBoxTitle, DynamoViewModel.BrandingResourceProvider.ProductName),
                         MessageBoxButton.OKCancel,
                         MessageBoxImage.Warning);
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
index 47f1fddd75d..453d2e03402 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml
@@ -1,25 +1,26 @@
-<Window x:Class="Dynamo.PackageManager.UI.PackageManagerSearchView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:controls="clr-namespace:Dynamo.Controls"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:p="clr-namespace:Dynamo.Wpf.Properties"
-        xmlns:ui="clr-namespace:Dynamo.UI"
-        xmlns:viewModels="clr-namespace:Dynamo.PackageManager.ViewModels"
-        Name="PackageSearch"
-        Title="{x:Static p:Resources.PackageSearchViewTitle}"
-        Width="460"
-        Height="520"
-        MinWidth="460"
-        MinHeight="300"
-        MaxWidth="600"
-        MaxHeight="700"
-        AllowsTransparency="True"
-        ResizeMode="CanResizeWithGrip"
-        WindowStartupLocation="CenterOwner"
-        WindowStyle="None"
-        mc:Ignorable="d">
+<Window
+    x:Class="Dynamo.PackageManager.UI.PackageManagerSearchView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:Dynamo.Controls"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:p="clr-namespace:Dynamo.Wpf.Properties"
+    xmlns:ui="clr-namespace:Dynamo.UI"
+    xmlns:viewModels="clr-namespace:Dynamo.PackageManager.ViewModels"
+    Name="PackageSearch"
+    Title="{x:Static p:Resources.PackageSearchViewTitle}"
+    Width="460"
+    Height="520"
+    MinWidth="460"
+    MinHeight="300"
+    MaxWidth="600"
+    MaxHeight="700"
+    AllowsTransparency="True"
+    ResizeMode="CanResizeWithGrip"
+    WindowStartupLocation="CenterOwner"
+    WindowStyle="None"
+    mc:Ignorable="d">
     <Window.Background>
         <SolidColorBrush Opacity="0" />
     </Window.Background>
@@ -50,7 +51,7 @@
             <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.Resources>
-           
+
             <!--  Local style for ListBoxItems, used in the package search results  -->
             <Style TargetType="{x:Type ListBoxItem}">
                 <Setter Property="Background" Value="Transparent" />
@@ -58,15 +59,17 @@
                 <Setter Property="Template">
                     <Setter.Value>
                         <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                            <Border x:Name="Border"
-                                    Padding="{TemplateBinding Padding}"
-                                    Background="{TemplateBinding Background}"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    SnapsToDevicePixels="true">
-                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <Border
+                                x:Name="Border"
+                                Padding="{TemplateBinding Padding}"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                SnapsToDevicePixels="true">
+                                <ContentPresenter
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </Border>
                             <!--  Overwriting default WPF triggers to stop ListBoxItems appearing with default styling  -->
                             <ControlTemplate.Triggers>
@@ -96,36 +99,40 @@
         </Grid.Resources>
 
         <!--  Header: Contains the window title, minimize, restore and close buttons  -->
-        <Border Name="titleBar"
-                Grid.Row="0"
-                Grid.RowSpan="4"
-                Background="{StaticResource DarkMidGreyBrush}"
-                CornerRadius="4"
-                MouseDown="PackageManagerSearchView_MouseDown">
+        <Border
+            Name="titleBar"
+            Grid.Row="0"
+            Grid.RowSpan="4"
+            Background="{StaticResource DarkMidGreyBrush}"
+            CornerRadius="4"
+            MouseDown="PackageManagerSearchView_MouseDown">
             <DockPanel HorizontalAlignment="Stretch">
-                <Button x:Name="closeButton"
-                        Margin="25,20"
-                        VerticalAlignment="Top"
-                        Click="CloseButton_Click"
-                        DockPanel.Dock="Right"
-                        KeyboardNavigation.IsTabStop="False"
-                        Style="{DynamicResource CloseButtonStyle}" />
-                <TextBlock x:Name="headerTitle"
-                           Margin="25,16"
-                           VerticalAlignment="Top"
-                           DockPanel.Dock="Left"
-                           FontFamily="{StaticResource ArtifaktElementRegular}"
-                           FontSize="20px"
-                           FontWeight="Regular"
-                           Foreground="{StaticResource PreferencesWindowFontColor}"
-                           Text="{x:Static p:Resources.PackageSearchHeader}"
-                           TextAlignment="Left" />
-                <Image Name="DisablePackageInstallIcon"
-                           Width="24"
-                           Height="24"
-                           Margin="0,20,5,0"
-                           HorizontalAlignment="Left"
-                           VerticalAlignment="Top">
+                <Button
+                    x:Name="closeButton"
+                    Margin="25,20"
+                    VerticalAlignment="Top"
+                    Click="CloseButton_Click"
+                    DockPanel.Dock="Right"
+                    KeyboardNavigation.IsTabStop="False"
+                    Style="{DynamicResource CloseButtonStyle}" />
+                <TextBlock
+                    x:Name="headerTitle"
+                    Margin="25,16"
+                    VerticalAlignment="Top"
+                    DockPanel.Dock="Left"
+                    FontFamily="{StaticResource ArtifaktElementRegular}"
+                    FontSize="20px"
+                    FontWeight="Regular"
+                    Foreground="{StaticResource PreferencesWindowFontColor}"
+                    Text="{x:Static p:Resources.PackageSearchHeader}"
+                    TextAlignment="Left" />
+                <Image
+                    Name="DisablePackageInstallIcon"
+                    Width="24"
+                    Height="24"
+                    Margin="0,20,5,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top">
                     <Image.ToolTip>
                         <ToolTip Content="{x:Static p:Resources.DisablePackageInstallIconTooltip}" Style="{StaticResource GenericToolTipLight}" />
                     </Image.ToolTip>
@@ -144,22 +151,24 @@
         </Border>
 
         <!--  Contains the search bar, sort and filter buttons  -->
-        <Border Name="searchBar"
-                Grid.Row="1"
-                Padding="25,18"
-                BorderBrush="#7E7E7E"
-                BorderThickness="0,1,0,0">
+        <Border
+            Name="searchBar"
+            Grid.Row="1"
+            Padding="25,18"
+            BorderBrush="#7E7E7E"
+            BorderThickness="0,1,0,0">
             <DockPanel>
                 <!--  Sort Button  -->
-                <Button Name="sortResultsButton"
-                        Width="20"
-                        Height="20"
-                        Margin="10,0,0,0"
-                        Background="{StaticResource PrimaryCharcoal300Brush}"
-                        BorderThickness="0"
-                        Click="OnSortButtonClicked"
-                        Cursor="Hand"
-                        DockPanel.Dock="Right">
+                <Button
+                    Name="sortResultsButton"
+                    Width="20"
+                    Height="20"
+                    Margin="10,0,0,0"
+                    Background="{StaticResource PrimaryCharcoal300Brush}"
+                    BorderThickness="0"
+                    Click="OnSortButtonClicked"
+                    Cursor="Hand"
+                    DockPanel.Dock="Right">
                     <Button.ToolTip>
                         <ToolTip Content="{x:Static p:Resources.PackageSortToolTip}" Style="{StaticResource GenericToolTipLight}" />
                     </Button.ToolTip>
@@ -175,58 +184,65 @@
 
                     <!--  When clicked, the sort button displays a ContextMenu of options to the user  -->
                     <Button.ContextMenu>
-                        <ContextMenu Width="180"
-                                     Background="{StaticResource NodeContextMenuBackground}"
-                                     Style="{StaticResource ContextMenuStyle}">
+                        <ContextMenu
+                            Width="180"
+                            Background="{StaticResource NodeContextMenuBackground}"
+                            Style="{StaticResource ContextMenuStyle}">
 
                             <!--  Sub-Title 'SORT BY'  -->
                             <Separator>
                                 <Separator.Template>
                                     <ControlTemplate TargetType="Separator">
                                         <StackPanel>
-                                            <TextBlock Margin="10,5"
-                                                       FontSize="11"
-                                                       Foreground="#8C8C8C "
-                                                       Text="{x:Static p:Resources.PackageSearchSortBy}" />
+                                            <TextBlock
+                                                Margin="10,5"
+                                                FontSize="11"
+                                                Foreground="#8C8C8C "
+                                                Text="{x:Static p:Resources.PackageSearchSortBy}" />
                                         </StackPanel>
                                     </ControlTemplate>
                                 </Separator.Template>
                             </Separator>
 
                             <!--  Sort By Package Name  -->
-                            <MenuItem Command="{Binding Path=SetSortingKeyCommand}"
-                                      CommandParameter="Name"
-                                      Header="{x:Static p:Resources.PackageSearchViewContextMenuSortByName}"
-                                      IsCheckable="True"
-                                      IsChecked="{Binding Path=SortingKey, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=Name, Mode=TwoWay}" />
+                            <MenuItem
+                                Command="{Binding Path=SetSortingKeyCommand}"
+                                CommandParameter="Name"
+                                Header="{x:Static p:Resources.PackageSearchViewContextMenuSortByName}"
+                                IsCheckable="True"
+                                IsChecked="{Binding Path=SortingKey, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=Name, Mode=TwoWay}" />
 
                             <!--  Sort By Most Recent Update  -->
-                            <MenuItem Command="{Binding Path=SetSortingKeyCommand}"
-                                      CommandParameter="LastUpdate"
-                                      Header="{x:Static p:Resources.PackageSearchViewContextMenuSortyByUpdate}"
-                                      IsCheckable="True"
-                                      IsChecked="{Binding Path=SortingKey, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=LastUpdate, Mode=TwoWay}" />
+                            <MenuItem
+                                Command="{Binding Path=SetSortingKeyCommand}"
+                                CommandParameter="LastUpdate"
+                                Header="{x:Static p:Resources.PackageSearchViewContextMenuSortyByUpdate}"
+                                IsCheckable="True"
+                                IsChecked="{Binding Path=SortingKey, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=LastUpdate, Mode=TwoWay}" />
 
                             <!--  Sort By Number of Downloads  -->
-                            <MenuItem Command="{Binding Path=SetSortingKeyCommand}"
-                                      CommandParameter="Downloads"
-                                      Header="{x:Static p:Resources.PackageSearchViewContextMenuSortByDownloads}"
-                                      IsCheckable="True"
-                                      IsChecked="{Binding Path=SortingKey, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=Downloads, Mode=TwoWay}" />
+                            <MenuItem
+                                Command="{Binding Path=SetSortingKeyCommand}"
+                                CommandParameter="Downloads"
+                                Header="{x:Static p:Resources.PackageSearchViewContextMenuSortByDownloads}"
+                                IsCheckable="True"
+                                IsChecked="{Binding Path=SortingKey, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=Downloads, Mode=TwoWay}" />
 
                             <!--  Sort By Number Of Votes  -->
-                            <MenuItem Command="{Binding Path=SetSortingKeyCommand}"
-                                      CommandParameter="Votes"
-                                      Header="{x:Static p:Resources.PackageSearchViewContextMenuSortByVotes}"
-                                      IsCheckable="True"
-                                      IsChecked="{Binding Path=SortingKey, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=Votes, Mode=TwoWay}" />
+                            <MenuItem
+                                Command="{Binding Path=SetSortingKeyCommand}"
+                                CommandParameter="Votes"
+                                Header="{x:Static p:Resources.PackageSearchViewContextMenuSortByVotes}"
+                                IsCheckable="True"
+                                IsChecked="{Binding Path=SortingKey, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=Votes, Mode=TwoWay}" />
 
                             <!--  Sort By Author Name  -->
-                            <MenuItem Command="{Binding Path=SetSortingKeyCommand}"
-                                      CommandParameter="Maintainers"
-                                      Header="{x:Static p:Resources.PackageSearchViewContextMenuSortByAuthor}"
-                                      IsCheckable="True"
-                                      IsChecked="{Binding Path=SortingKey, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=Maintainers, Mode=TwoWay}" />
+                            <MenuItem
+                                Command="{Binding Path=SetSortingKeyCommand}"
+                                CommandParameter="Maintainers"
+                                Header="{x:Static p:Resources.PackageSearchViewContextMenuSortByAuthor}"
+                                IsCheckable="True"
+                                IsChecked="{Binding Path=SortingKey, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=Maintainers, Mode=TwoWay}" />
 
                             <Separator />
 
@@ -235,42 +251,46 @@
                                 <Separator.Template>
                                     <ControlTemplate TargetType="Separator">
                                         <StackPanel>
-                                            <TextBlock Margin="10,5"
-                                                       FontSize="11"
-                                                       Foreground="#8C8C8C "
-                                                       Text="{x:Static p:Resources.PackageSearchOrder}" />
+                                            <TextBlock
+                                                Margin="10,5"
+                                                FontSize="11"
+                                                Foreground="#8C8C8C "
+                                                Text="{x:Static p:Resources.PackageSearchOrder}" />
                                         </StackPanel>
                                     </ControlTemplate>
                                 </Separator.Template>
                             </Separator>
 
                             <!--  Sort Ascending  -->
-                            <MenuItem Command="{Binding Path=SetSortingDirectionCommand}"
-                                      CommandParameter="Ascending"
-                                      Header="{x:Static p:Resources.PackageSearchViewContextMenuOrderAscending}"
-                                      IsCheckable="True"
-                                      IsChecked="{Binding Path=SortingDirection, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=Ascending, Mode=TwoWay}" />
+                            <MenuItem
+                                Command="{Binding Path=SetSortingDirectionCommand}"
+                                CommandParameter="Ascending"
+                                Header="{x:Static p:Resources.PackageSearchViewContextMenuOrderAscending}"
+                                IsCheckable="True"
+                                IsChecked="{Binding Path=SortingDirection, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=Ascending, Mode=TwoWay}" />
 
                             <!--  Sort Descending  -->
-                            <MenuItem Command="{Binding Path=SetSortingDirectionCommand}"
-                                      CommandParameter="Descending"
-                                      Header="{x:Static p:Resources.PackageSearchViewContextMenuOrderDescending}"
-                                      IsCheckable="True"
-                                      IsChecked="{Binding Path=SortingDirection, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=Descending, Mode=TwoWay}" />
+                            <MenuItem
+                                Command="{Binding Path=SetSortingDirectionCommand}"
+                                CommandParameter="Descending"
+                                Header="{x:Static p:Resources.PackageSearchViewContextMenuOrderDescending}"
+                                IsCheckable="True"
+                                IsChecked="{Binding Path=SortingDirection, Converter={StaticResource EnumToBoolConverter}, ConverterParameter=Descending, Mode=TwoWay}" />
                         </ContextMenu>
                     </Button.ContextMenu>
                 </Button>
 
                 <!--  Filter Button  -->
-                <Button Name="filterResultsButton"
-                        Width="20"
-                        Height="20"
-                        Margin="25,0,0,0"
-                        Background="{StaticResource PrimaryCharcoal300Brush}"
-                        BorderThickness="0"
-                        Click="OnFilterButtonClicked"
-                        Cursor="Hand"
-                        DockPanel.Dock="Right">
+                <Button
+                    Name="filterResultsButton"
+                    Width="20"
+                    Height="20"
+                    Margin="25,0,0,0"
+                    Background="{StaticResource PrimaryCharcoal300Brush}"
+                    BorderThickness="0"
+                    Click="OnFilterButtonClicked"
+                    Cursor="Hand"
+                    DockPanel.Dock="Right">
                     <Button.ToolTip>
                         <ToolTip Content="{x:Static p:Resources.PackageHostDependencyFilter}" Style="{StaticResource GenericToolTipLight}" />
                     </Button.ToolTip>
@@ -286,13 +306,14 @@
 
                     <!--  When clicked, the filter button displays a ContextMenu of options to the user  -->
                     <Button.ContextMenu>
-                        <ContextMenu Name="HostFilter"
-                                     Background="{StaticResource NodeContextMenuBackground}"
-                                     DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Mode=Self}}"
-                                     DisplayMemberPath="FilterName"
-                                     Width="180"
-                                     ItemsSource="{Binding HostFilter}"
-                                     Style="{StaticResource ContextMenuStyle}">
+                        <ContextMenu
+                            Name="HostFilter"
+                            Width="180"
+                            Background="{StaticResource NodeContextMenuBackground}"
+                            DataContext="{Binding PlacementTarget.DataContext, RelativeSource={RelativeSource Mode=Self}}"
+                            DisplayMemberPath="FilterName"
+                            ItemsSource="{Binding HostFilter}"
+                            Style="{StaticResource ContextMenuStyle}">
                             <ContextMenu.ItemContainerStyle>
                                 <Style BasedOn="{StaticResource ContextMenuItemStyle}" TargetType="{x:Type MenuItem}">
                                     <Setter Property="IsCheckable" Value="True" />
@@ -308,42 +329,47 @@
 
                 <!--  Search Bar  -->
                 <Grid Name="searchBarGrid" DockPanel.Dock="Left">
-                    <TextBox Name="searchTextBox"
-                             Padding="15,11,5,10"
-                             Background="#353535"
-                             BorderThickness="0"
-                             CaretBrush="White"
-                             FontFamily="{StaticResource ArtifaktElementRegular}"
-                             FontSize="14px"
-                             Foreground="#F5F5F5"
-                             KeyboardNavigation.TabIndex="0"
-                             Text="{Binding Path=SearchText, Mode=TwoWay}"
-                             TextChanged="SearchTextBox_TextChanged"
-                             Visibility="{Binding ShowSearchText, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                    <TextBox
+                        Name="searchTextBox"
+                        Padding="15,11,5,10"
+                        Background="#353535"
+                        BorderThickness="0"
+                        CaretBrush="White"
+                        FontFamily="{StaticResource ArtifaktElementRegular}"
+                        FontSize="14px"
+                        Foreground="#F5F5F5"
+                        KeyboardNavigation.TabIndex="0"
+                        Text="{Binding Path=SearchText, Mode=TwoWay}"
+                        TextChanged="SearchTextBox_TextChanged"
+                        Visibility="{Binding ShowSearchText, Converter={StaticResource BooleanToVisibilityConverter}}" />
 
                     <!--  A watermark that appears when the user hasn't entered a search query  -->
-                    <TextBlock Name="searchTextBoxWatermark"
-                               Padding="17,11,5,10"
-                               Background="Transparent"
-                               FontFamily="{StaticResource ArtifaktElementRegular}"
-                               FontSize="14px"
-                               Foreground="#F5F5F5"
-                               IsHitTestVisible="False"
-                               Opacity="0.5"
-                               Text="{Binding SearchBoxPrompt}"
-                               Visibility="{Binding Path=SearchText, Converter={StaticResource NonEmptyStringToCollapsedConverter}}" />
+                    <TextBlock
+                        Name="searchTextBoxWatermark"
+                        Padding="17,11,5,10"
+                        Background="Transparent"
+                        FontFamily="{StaticResource ArtifaktElementRegular}"
+                        FontSize="14px"
+                        Foreground="#F5F5F5"
+                        IsHitTestVisible="False"
+                        Opacity="0.5"
+                        Text="{Binding SearchBoxPrompt}"
+                        Visibility="{Binding Path=SearchText, Converter={StaticResource NonEmptyStringToCollapsedConverter}}" />
 
                     <!--  'X' button to reset search query text  -->
-                    <Button Name="clearSearchTextBox" Margin="10"
-                            HorizontalAlignment="Right"
-                            Command="{Binding ClearSearchTextBoxCommand}"
-                            Cursor="Hand"
-                            Visibility="{Binding Path=SearchText, Converter={StaticResource EmptyStringToCollapsedConverter}}">
+                    <Button
+                        Name="clearSearchTextBox"
+                        Margin="10"
+                        HorizontalAlignment="Right"
+                        Command="{Binding ClearSearchTextBoxCommand}"
+                        Cursor="Hand"
+                        Visibility="{Binding Path=SearchText, Converter={StaticResource EmptyStringToCollapsedConverter}}">
                         <Button.Template>
                             <ControlTemplate>
-                                <Ellipse Name="nodeIcon"
-                                         Width="16"
-                                         Height="16">
+                                <Ellipse
+                                    Name="nodeIcon"
+                                    Width="16"
+                                    Height="16">
                                     <Ellipse.Fill>
                                         <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Circle close.png" Stretch="UniformToFill" />
                                     </Ellipse.Fill>
@@ -356,20 +382,22 @@
         </Border>
 
         <!--  Contains the package search results  -->
-        <Border Name="results"
-                Grid.Row="2"
-                Grid.RowSpan="2"
-                Margin="0,0,0,3"
-                Background="#2A2A2A">
-
-            <ListBox Name="searchResultsListBox"
-                     Background="#2A2A2A"
-                     BorderThickness="0"
-                     ItemsSource="{Binding Path=SearchResults}"
-                     ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                     ScrollViewer.VerticalScrollBarVisibility="Auto"
-                     SelectedIndex="{Binding Path=SelectedIndex}"
-                     VirtualizingPanel.ScrollUnit="Pixel">
+        <Border
+            Name="results"
+            Grid.Row="2"
+            Grid.RowSpan="2"
+            Margin="0,0,0,3"
+            Background="#2A2A2A">
+
+            <ListBox
+                Name="searchResultsListBox"
+                Background="#2A2A2A"
+                BorderThickness="0"
+                ItemsSource="{Binding Path=SearchResults}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                ScrollViewer.VerticalScrollBarVisibility="Auto"
+                SelectedIndex="{Binding Path=SelectedIndex}"
+                VirtualizingPanel.ScrollUnit="Pixel">
                 <ListBox.Resources>
                     <!--  Local style used for labels on result, e.g. Number of Installs  -->
                     <Style x:Key="resultLabelStyle" TargetType="TextBlock">
@@ -404,30 +432,34 @@
                             </Grid.RowDefinitions>
 
                             <!--  Top Row  -->
-                            <DockPanel Name="resultTopRow"
-                                       Grid.Row="0"
-                                       Margin="15,15,5,0"
-                                       LastChildFill="False">
+                            <DockPanel
+                                Name="resultTopRow"
+                                Grid.Row="0"
+                                Margin="15,15,5,0"
+                                LastChildFill="False">
 
                                 <!--  View Details Button  -->
-                                <Button Name="viewDetailsButton"
-                                        Click="ViewDetailsButton_OnClick"
-                                        Content="{x:Static p:Resources.PackageSearchResultViewDetails}"
-                                        DockPanel.Dock="Right">
+                                <Button
+                                    Name="viewDetailsButton"
+                                    Click="ViewDetailsButton_OnClick"
+                                    Content="{x:Static p:Resources.PackageSearchResultViewDetails}"
+                                    DockPanel.Dock="Right">
                                     <Button.Template>
                                         <ControlTemplate TargetType="{x:Type Button}">
-                                            <Border Name="ButtonBorder"
-                                                    Height="25"
-                                                    Padding="5,0"
-                                                    BorderThickness="2"
-                                                    CornerRadius="2">
+                                            <Border
+                                                Name="ButtonBorder"
+                                                Height="25"
+                                                Padding="5,0"
+                                                BorderThickness="2"
+                                                CornerRadius="2">
                                                 <Grid x:Name="viewDetailsGrid">
                                                     <DockPanel>
-                                                        <Rectangle Width="9"
-                                                                   Height="9"
-                                                                   Margin="0,0,0,0"
-                                                                   VerticalAlignment="Center"
-                                                                   DockPanel.Dock="Left">
+                                                        <Rectangle
+                                                            Width="9"
+                                                            Height="9"
+                                                            Margin="0,0,0,0"
+                                                            VerticalAlignment="Center"
+                                                            DockPanel.Dock="Left">
                                                             <Rectangle.Style>
                                                                 <Style TargetType="Rectangle">
                                                                     <Style.Triggers>
@@ -449,15 +481,16 @@
                                                                 </Style>
                                                             </Rectangle.Style>
                                                         </Rectangle>
-                                                        <TextBlock Name="textBlock"
-                                                                   Padding="4,4,4,3"
-                                                                   HorizontalAlignment="Right"
-                                                                   VerticalAlignment="Center"
-                                                                   Cursor="Hand"
-                                                                   DockPanel.Dock="Right"
-                                                                   FontFamily="{StaticResource ArtifaktElementRegular}"
-                                                                   FontSize="11"
-                                                                   Text="{TemplateBinding Content}" />
+                                                        <TextBlock
+                                                            Name="textBlock"
+                                                            Padding="4,4,4,3"
+                                                            HorizontalAlignment="Right"
+                                                            VerticalAlignment="Center"
+                                                            Cursor="Hand"
+                                                            DockPanel.Dock="Right"
+                                                            FontFamily="{StaticResource ArtifaktElementRegular}"
+                                                            FontSize="11"
+                                                            Text="{TemplateBinding Content}" />
                                                     </DockPanel>
                                                 </Grid>
                                             </Border>
@@ -483,77 +516,81 @@
                                 </Button>
 
                                 <!--  Install Button  -->
-                                <Button Name="installButton"
-                                        Command="{Binding DownloadLatestCommand}"
-                                        Content="{Binding CanInstall, Converter={StaticResource InstalledButtonTextConverter}}"
-                                        IsEnabled="{Binding IsEnabledForInstall}"
-                                        DockPanel.Dock="Right">
+                                <Button
+                                    Name="installButton"
+                                    Command="{Binding DownloadLatestCommand}"
+                                    Content="{Binding CanInstall, Converter={StaticResource InstalledButtonTextConverter}}"
+                                    DockPanel.Dock="Right"
+                                    IsEnabled="{Binding IsEnabledForInstall}">
                                     <Button.Style>
                                         <Style TargetType="Button">
                                             <Setter Property="Template">
                                                 <Setter.Value>
                                                     <ControlTemplate TargetType="{x:Type Button}">
-                                                        <Border Name="ButtonBorder"
-                                                                Height="25"
-                                                                Padding="5,0"
-                                                                BorderThickness="2"
-                                                                CornerRadius="2">
+                                                        <Border
+                                                            Name="ButtonBorder"
+                                                            Height="25"
+                                                            Padding="5,0"
+                                                            BorderThickness="2"
+                                                            CornerRadius="2">
                                                             <Grid x:Name="installPackageGrid">
 
                                                                 <DockPanel LastChildFill="False">
-                                                                <TextBlock Name="textBlock"
-                                                                           Padding="4,4,4,3"
-                                                                           VerticalAlignment="Center"
-                                                                           Cursor="Hand"
-                                                                           DockPanel.Dock="Right"
-                                                                           FontFamily="{StaticResource ArtifaktElementRegular}"
-                                                                           FontSize="11"
-                                                                           Text="{TemplateBinding Content}" />
-                                                                <Rectangle Width="10"
-                                                                           Height="10"
-                                                                           VerticalAlignment="Center"
-                                                                           DockPanel.Dock="Left">
-                                                                    <Rectangle.Style>
-                                                                        <Style TargetType="Rectangle">
-                                                                            <Style.Triggers>
-                                                                                <DataTrigger Binding="{Binding Path=Model.IsDeprecated}" Value="True">
-                                                                                    <Setter Property="Fill">
-                                                                                        <Setter.Value>
-                                                                                            <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Add - disabled.png" />
-                                                                                        </Setter.Value>
-                                                                                    </Setter>
-                                                                                </DataTrigger>
-                                                                                <DataTrigger Binding="{Binding Path=IsEnabledForInstall}" Value="False">
-                                                                                    <Setter Property="Fill">
-                                                                                        <Setter.Value>
-                                                                                            <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Add - disabled.png" />
-                                                                                        </Setter.Value>
-                                                                                    </Setter>
-                                                                                </DataTrigger>
-                                                                                <DataTrigger Binding="{Binding Path=CanInstall}" Value="False">
-                                                                                    <Setter Property="Fill">
-                                                                                        <Setter.Value>
-                                                                                            <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/checkmark - grey.png" />
-                                                                                        </Setter.Value>
-                                                                                    </Setter>
-                                                                                </DataTrigger>
-                                                                                <MultiDataTrigger>
-                                                                                    <MultiDataTrigger.Conditions>
-                                                                                        <Condition Binding="{Binding Path=Model.IsDeprecated}" Value="False" />
-                                                                                        <Condition Binding="{Binding Path=CanInstall}" Value="True" />
-                                                                                        <Condition Binding="{Binding Path=IsEnabledForInstall}" Value="True"/>
-                                                                                    </MultiDataTrigger.Conditions>
-                                                                                    <Setter Property="Fill">
-                                                                                        <Setter.Value>
-                                                                                            <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Add - default.png" />
-                                                                                        </Setter.Value>
-                                                                                    </Setter>
-                                                                                </MultiDataTrigger>
-                                                                            </Style.Triggers>
-                                                                        </Style>
-                                                                    </Rectangle.Style>
-                                                                </Rectangle>
-                                                            </DockPanel>
+                                                                    <TextBlock
+                                                                        Name="textBlock"
+                                                                        Padding="4,4,4,3"
+                                                                        VerticalAlignment="Center"
+                                                                        Cursor="Hand"
+                                                                        DockPanel.Dock="Right"
+                                                                        FontFamily="{StaticResource ArtifaktElementRegular}"
+                                                                        FontSize="11"
+                                                                        Text="{TemplateBinding Content}" />
+                                                                    <Rectangle
+                                                                        Width="10"
+                                                                        Height="10"
+                                                                        VerticalAlignment="Center"
+                                                                        DockPanel.Dock="Left">
+                                                                        <Rectangle.Style>
+                                                                            <Style TargetType="Rectangle">
+                                                                                <Style.Triggers>
+                                                                                    <DataTrigger Binding="{Binding Path=Model.IsDeprecated}" Value="True">
+                                                                                        <Setter Property="Fill">
+                                                                                            <Setter.Value>
+                                                                                                <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Add - disabled.png" />
+                                                                                            </Setter.Value>
+                                                                                        </Setter>
+                                                                                    </DataTrigger>
+                                                                                    <DataTrigger Binding="{Binding Path=IsEnabledForInstall}" Value="False">
+                                                                                        <Setter Property="Fill">
+                                                                                            <Setter.Value>
+                                                                                                <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Add - disabled.png" />
+                                                                                            </Setter.Value>
+                                                                                        </Setter>
+                                                                                    </DataTrigger>
+                                                                                    <DataTrigger Binding="{Binding Path=CanInstall}" Value="False">
+                                                                                        <Setter Property="Fill">
+                                                                                            <Setter.Value>
+                                                                                                <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/checkmark - grey.png" />
+                                                                                            </Setter.Value>
+                                                                                        </Setter>
+                                                                                    </DataTrigger>
+                                                                                    <MultiDataTrigger>
+                                                                                        <MultiDataTrigger.Conditions>
+                                                                                            <Condition Binding="{Binding Path=Model.IsDeprecated}" Value="False" />
+                                                                                            <Condition Binding="{Binding Path=CanInstall}" Value="True" />
+                                                                                            <Condition Binding="{Binding Path=IsEnabledForInstall}" Value="True" />
+                                                                                        </MultiDataTrigger.Conditions>
+                                                                                        <Setter Property="Fill">
+                                                                                            <Setter.Value>
+                                                                                                <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Add - default.png" />
+                                                                                            </Setter.Value>
+                                                                                        </Setter>
+                                                                                    </MultiDataTrigger>
+                                                                                </Style.Triggers>
+                                                                            </Style>
+                                                                        </Rectangle.Style>
+                                                                    </Rectangle>
+                                                                </DockPanel>
 
                                                             </Grid>
                                                         </Border>
@@ -587,15 +624,16 @@
                                         <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
-                                    <TextBlock Name="packageName"
-                                               Grid.Column="0"
-                                               VerticalAlignment="Center"
-                                               FontFamily="{StaticResource ArtifaktElementRegular}"
-                                               FontSize="14"
-                                               FontWeight="SemiBold"
-                                               Text="{Binding Path=Model.Name}"
-                                               TextTrimming="CharacterEllipsis"
-                                               TextWrapping="NoWrap">
+                                    <TextBlock
+                                        Name="packageName"
+                                        Grid.Column="0"
+                                        VerticalAlignment="Center"
+                                        FontFamily="{StaticResource ArtifaktElementRegular}"
+                                        FontSize="14"
+                                        FontWeight="SemiBold"
+                                        Text="{Binding Path=Model.Name}"
+                                        TextTrimming="CharacterEllipsis"
+                                        TextWrapping="NoWrap">
                                         <TextBlock.Style>
                                             <Style TargetType="TextBlock">
                                                 <Style.Triggers>
@@ -615,139 +653,156 @@
                                             <ToolTip Content="{Binding Path=Model.Name}" Style="{StaticResource GenericToolTipLight}" />
                                         </TextBlock.ToolTip>
                                     </TextBlock>
-                                    <Border Name="newPackageLabel"
-                                            Grid.Column="1"
-                                            Width="Auto"
-                                            Height="18"
-                                            Margin="7,-3,7,0"
-                                            HorizontalAlignment="Right"
+                                    <Border
+                                        Name="newPackageLabel"
+                                        Grid.Column="1"
+                                        Width="Auto"
+                                        Height="18"
+                                        Margin="7,-3,7,0"
+                                        HorizontalAlignment="Right"
+                                        VerticalAlignment="Center"
+                                        Background="Transparent"
+                                        BorderBrush="{StaticResource PrimaryCharcoal200Brush}"
+                                        BorderThickness="1"
+                                        CornerRadius="3"
+                                        Visibility="{Binding Path=Model.LatestVersionCreated, Converter={StaticResource DateToVisibilityCollapsedConverter}}">
+                                        <TextBlock
+                                            Margin="3,0"
+                                            Padding="0,2,0,0"
+                                            HorizontalAlignment="Center"
                                             VerticalAlignment="Center"
-                                            Background="Transparent"
-                                            BorderBrush="{StaticResource PrimaryCharcoal200Brush}"
-                                            BorderThickness="1"
-                                            CornerRadius="3"
-                                            Visibility="{Binding Path=Model.LatestVersionCreated, Converter={StaticResource DateToVisibilityCollapsedConverter}}">
-                                        <TextBlock Margin="3,0"
-                                                   Padding="0,2,0,0"
-                                                   HorizontalAlignment="Center"
-                                                   VerticalAlignment="Center"
-                                                   FontFamily="{StaticResource ArtifaktElementRegular}"
-                                                   FontSize="11"
-                                                   Foreground="{StaticResource PrimaryCharcoal200Brush}"
-                                                   Text="{Binding Path=Model, Converter={StaticResource DateToPackageLabelCollapsedConverter}}" />
+                                            FontFamily="{StaticResource ArtifaktElementRegular}"
+                                            FontSize="11"
+                                            Foreground="{StaticResource PrimaryCharcoal200Brush}"
+                                            Text="{Binding Path=Model, Converter={StaticResource DateToPackageLabelCollapsedConverter}}" />
                                     </Border>
                                 </Grid>
                             </DockPanel>
 
                             <!--  Middle Row  -->
-                            <DockPanel Name="requirementsRow"
-                                       Grid.Row="1"
-                                       Margin="15,0,0,0"
-                                       VerticalAlignment="Center"
-                                       LastChildFill="False">
-                                <Rectangle Width="9"
-                                           Height="9"
-                                           Margin="0,0,0,1"
-                                           VerticalAlignment="Center"
-                                           DockPanel.Dock="Left"
-                                           Visibility="{Binding Path=Model.Hosts, Converter={StaticResource ListHasMoreThanNItemsToVisibilityConverter}}">
+                            <DockPanel
+                                Name="requirementsRow"
+                                Grid.Row="1"
+                                Margin="15,0,0,0"
+                                VerticalAlignment="Center"
+                                LastChildFill="False">
+                                <Rectangle
+                                    Width="9"
+                                    Height="9"
+                                    Margin="0,0,0,1"
+                                    VerticalAlignment="Center"
+                                    DockPanel.Dock="Left"
+                                    Visibility="{Binding Path=Model.Hosts, Converter={StaticResource ListHasMoreThanNItemsToVisibilityConverter}}">
                                     <Rectangle.Fill>
                                         <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Requirements - disabled.png" />
                                     </Rectangle.Fill>
                                 </Rectangle>
-                                <TextBlock x:Name="requirementsLabel"
-                                           Margin="5,0"
-                                           DockPanel.Dock="Left"
-                                           Style="{StaticResource resultLabelStyle}"
-                                           Text="{Binding Model.Hosts, Converter={StaticResource DependencyListToStringConverter}}"
-                                           Visibility="{Binding Path=Model.Hosts, Converter={StaticResource ListHasMoreThanNItemsToVisibilityConverter}}" />
+                                <TextBlock
+                                    x:Name="requirementsLabel"
+                                    Margin="5,0"
+                                    DockPanel.Dock="Left"
+                                    Style="{StaticResource resultLabelStyle}"
+                                    Text="{Binding Model.Hosts, Converter={StaticResource DependencyListToStringConverter}}"
+                                    Visibility="{Binding Path=Model.Hosts, Converter={StaticResource ListHasMoreThanNItemsToVisibilityConverter}}" />
                             </DockPanel>
 
                             <!--  Bottom Row  -->
-                            <DockPanel Name="resultBottomRow"
-                                       Grid.Row="2"
-                                       Margin="15,0,5,15"
-                                       VerticalAlignment="Bottom"
-                                       LastChildFill="True">
-                                <TextBlock Name="dateLabel"
-                                           Margin="5,0"
-                                           DockPanel.Dock="Right"
-                                           Style="{StaticResource resultLabelStyle}"
-                                           Text="{Binding Path=Model.LatestVersionCreated, Converter={StaticResource PrettyDateConverter}}" />
-                                <Rectangle Width="10"
-                                           Height="10"
-                                           Margin="5,0,0,2"
-                                           VerticalAlignment="Center"
-                                           DockPanel.Dock="Right">
+                            <DockPanel
+                                Name="resultBottomRow"
+                                Grid.Row="2"
+                                Margin="15,0,5,15"
+                                VerticalAlignment="Bottom"
+                                LastChildFill="True">
+                                <TextBlock
+                                    Name="dateLabel"
+                                    Margin="5,0"
+                                    DockPanel.Dock="Right"
+                                    Style="{StaticResource resultLabelStyle}"
+                                    Text="{Binding Path=Model.LatestVersionCreated, Converter={StaticResource PrettyDateConverter}}" />
+                                <Rectangle
+                                    Width="10"
+                                    Height="10"
+                                    Margin="5,0,0,2"
+                                    VerticalAlignment="Center"
+                                    DockPanel.Dock="Right">
                                     <Rectangle.Fill>
                                         <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Date.png" />
                                     </Rectangle.Fill>
                                 </Rectangle>
-                                <TextBlock Name="noDownloadsLabel"
-                                           Margin="5,0"
-                                           DockPanel.Dock="Right"
-                                           Style="{StaticResource resultLabelStyle}"
-                                           Text="{Binding Path=Model.Downloads}" />
-                                <Rectangle Width="10"
-                                           Height="10"
-                                           Margin="5,0,0,2"
-                                           VerticalAlignment="Center"
-                                           DockPanel.Dock="Right">
+                                <TextBlock
+                                    Name="noDownloadsLabel"
+                                    Margin="5,0"
+                                    DockPanel.Dock="Right"
+                                    Style="{StaticResource resultLabelStyle}"
+                                    Text="{Binding Path=Model.Downloads}" />
+                                <Rectangle
+                                    Width="10"
+                                    Height="10"
+                                    Margin="5,0,0,2"
+                                    VerticalAlignment="Center"
+                                    DockPanel.Dock="Right">
                                     <Rectangle.Fill>
                                         <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Download.png" />
                                     </Rectangle.Fill>
                                 </Rectangle>
-                                <TextBlock Name="noFavoritesLabel"
-                                           Margin="5,0"
-                                           DockPanel.Dock="Right"
-                                           Style="{StaticResource resultLabelStyle}"
-                                           Text="{Binding Path=Model.Votes, Converter={StaticResource NegativeIntToZeroConverter}}" />
-                                <Rectangle Width="10"
-                                           Height="10"
-                                           Margin="5,0,0,2"
-                                           VerticalAlignment="Center"
-                                           DockPanel.Dock="Right">
+                                <TextBlock
+                                    Name="noFavoritesLabel"
+                                    Margin="5,0"
+                                    DockPanel.Dock="Right"
+                                    Style="{StaticResource resultLabelStyle}"
+                                    Text="{Binding Path=Model.Votes, Converter={StaticResource NegativeIntToZeroConverter}}" />
+                                <Rectangle
+                                    Width="10"
+                                    Height="10"
+                                    Margin="5,0,0,2"
+                                    VerticalAlignment="Center"
+                                    DockPanel.Dock="Right">
                                     <Rectangle.Fill>
                                         <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Favorite.png" />
                                     </Rectangle.Fill>
                                 </Rectangle>
-                                <TextBlock Name="versionLabel"
-                                           Margin="5,0"
-                                           DockPanel.Dock="Right"
-                                           Style="{StaticResource resultLabelStyle}"
-                                           Text="{Binding Path=Model.LatestVersion}" />
-                                <Rectangle Width="10"
-                                           Height="10"
-                                           Margin="5,0,0,2"
-                                           VerticalAlignment="Center"
-                                           DockPanel.Dock="Right">
+                                <TextBlock
+                                    Name="versionLabel"
+                                    Margin="5,0"
+                                    DockPanel.Dock="Right"
+                                    Style="{StaticResource resultLabelStyle}"
+                                    Text="{Binding Path=Model.LatestVersion}" />
+                                <Rectangle
+                                    Width="10"
+                                    Height="10"
+                                    Margin="5,0,0,2"
+                                    VerticalAlignment="Center"
+                                    DockPanel.Dock="Right">
                                     <Rectangle.Fill>
                                         <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Flag.png" />
                                     </Rectangle.Fill>
                                 </Rectangle>
-                                <Rectangle Width="10"
-                                           Height="10"
-                                           Margin="0,0,0,2"
-                                           VerticalAlignment="Center"
-                                           DockPanel.Dock="Left">
+                                <Rectangle
+                                    Width="10"
+                                    Height="10"
+                                    Margin="0,0,0,2"
+                                    VerticalAlignment="Center"
+                                    DockPanel.Dock="Left">
                                     <Rectangle.Fill>
                                         <ImageBrush ImageSource="/DynamoCoreWpf;component/UI/Images/Profile.png" />
                                     </Rectangle.Fill>
                                 </Rectangle>
-                                <TextBlock Name="authorName"
-                                           Margin="5,0"
-                                           DockPanel.Dock="Left"
-                                           Style="{StaticResource resultLabelStyle}"
-                                           Text="{Binding Path=Model.Maintainers}"
-                                           TextTrimming="CharacterEllipsis" />
+                                <TextBlock
+                                    Name="authorName"
+                                    Margin="5,0"
+                                    DockPanel.Dock="Left"
+                                    Style="{StaticResource resultLabelStyle}"
+                                    Text="{Binding Path=Model.Maintainers}"
+                                    TextTrimming="CharacterEllipsis" />
                             </DockPanel>
 
                             <!--  A 1px bar that separates List Items  -->
-                            <Rectangle Name="separator"
-                                       Grid.Row="2"
-                                       Height="1"
-                                       VerticalAlignment="Bottom"
-                                       Fill="{StaticResource DarkMidGreyBrush}" />
+                            <Rectangle
+                                Name="separator"
+                                Grid.Row="2"
+                                Height="1"
+                                VerticalAlignment="Bottom"
+                                Fill="{StaticResource DarkMidGreyBrush}" />
 
                         </Grid>
                     </DataTemplate>
@@ -756,15 +811,16 @@
         </Border>
 
         <!--  Download bar: A stacking list of (up to 3) most-recently downloaded packages. Appears when the user installs a package.  -->
-        <ListBox Name="DownloadsListBox"
-                 Grid.Row="3"
-                 Margin="0,5,0,10"
-                 Background="Transparent"
-                 BorderThickness="0"
-                 IsHitTestVisible="True"
-                 ItemsSource="{Binding Path=Downloads, UpdateSourceTrigger=PropertyChanged}"
-                 ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-                 ScrollViewer.VerticalScrollBarVisibility="Disabled">
+        <ListBox
+            Name="DownloadsListBox"
+            Grid.Row="3"
+            Margin="0,5,0,10"
+            Background="Transparent"
+            BorderThickness="0"
+            IsHitTestVisible="True"
+            ItemsSource="{Binding Path=Downloads, UpdateSourceTrigger=PropertyChanged}"
+            ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+            ScrollViewer.VerticalScrollBarVisibility="Disabled">
             <ListBox.ItemsPanel>
                 <ItemsPanelTemplate>
                     <!--  Ensure the stackpanel fills bottom-to-top  -->
@@ -777,10 +833,11 @@
                 <DataTemplate>
                     <Grid>
                         <!--  Contains everything except for the download status flag  -->
-                        <Border Name="mainBody"
-                                Padding="15,10"
-                                Background="#4E4E4E"
-                                CornerRadius="3">
+                        <Border
+                            Name="mainBody"
+                            Padding="15,10"
+                            Background="#4E4E4E"
+                            CornerRadius="3">
                             <Grid Height="40">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="23" />
@@ -793,25 +850,27 @@
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
                                 <!--  Download Icon  -->
-                                <Image Name="downloadCompletedIcon"
-                                       Grid.Column="0"
-                                       Grid.Row="0"
-                                       Grid.RowSpan="2"
-                                       Width="16"
-                                       Height="16"
-                                       VerticalAlignment="Center"
-                                       Source="/DynamoCoreWpf;component/UI/Images/icon-shape.png"
-                                       Visibility="Collapsed" />
-                                <Image Name="downloadingIcon"
-                                       Grid.Column="0"
-                                       Grid.Row="0"
-                                       Grid.RowSpan="2"
-                                       Width="16"
-                                       Height="16"
-                                       VerticalAlignment="Center"
-                                       RenderTransformOrigin="0.5,0.5"
-                                       Source="/DynamoCoreWpf;component/UI/Images/Progress circle.png"
-                                       Visibility="Visible">
+                                <Image
+                                    Name="downloadCompletedIcon"
+                                    Grid.Row="0"
+                                    Grid.RowSpan="2"
+                                    Grid.Column="0"
+                                    Width="16"
+                                    Height="16"
+                                    VerticalAlignment="Center"
+                                    Source="/DynamoCoreWpf;component/UI/Images/icon-shape.png"
+                                    Visibility="Collapsed" />
+                                <Image
+                                    Name="downloadingIcon"
+                                    Grid.Row="0"
+                                    Grid.RowSpan="2"
+                                    Grid.Column="0"
+                                    Width="16"
+                                    Height="16"
+                                    VerticalAlignment="Center"
+                                    RenderTransformOrigin="0.5,0.5"
+                                    Source="/DynamoCoreWpf;component/UI/Images/Progress circle.png"
+                                    Visibility="Visible">
                                     <Image.RenderTransform>
                                         <RotateTransform x:Name="AnimatedRotateTransform" Angle="0" />
                                     </Image.RenderTransform>
@@ -819,13 +878,14 @@
                                         <EventTrigger RoutedEvent="Window.Loaded">
                                             <BeginStoryboard>
                                                 <Storyboard>
-                                                    <DoubleAnimation By="10"
-                                                                     FillBehavior="Stop"
-                                                                     RepeatBehavior="Forever"
-                                                                     Storyboard.TargetName="AnimatedRotateTransform"
-                                                                     Storyboard.TargetProperty="Angle"
-                                                                     To="360"
-                                                                     Duration="0:0:0.5" />
+                                                    <DoubleAnimation
+                                                        By="10"
+                                                        FillBehavior="Stop"
+                                                        RepeatBehavior="Forever"
+                                                        Storyboard.TargetName="AnimatedRotateTransform"
+                                                        Storyboard.TargetProperty="Angle"
+                                                        To="360"
+                                                        Duration="0:0:0.5" />
                                                 </Storyboard>
                                             </BeginStoryboard>
                                         </EventTrigger>
@@ -833,70 +893,76 @@
                                 </Image>
 
                                 <!--  Package Name  -->
-                                <TextBlock Name="name"
-                                           Grid.Row="0"
-                                           Grid.Column="1"
-                                           Margin="10,0,0,0"
-                                           VerticalAlignment="Bottom"
-                                           FontFamily="{StaticResource ArtifaktElementRegular}"
-                                           FontSize="14"
-                                           Foreground="#F5F5F5"
-                                           Text="{Binding Path=Name}"
-                                           TextTrimming="CharacterEllipsis" />
-                                
+                                <TextBlock
+                                    Name="name"
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    Margin="10,0,0,0"
+                                    VerticalAlignment="Bottom"
+                                    FontFamily="{StaticResource ArtifaktElementRegular}"
+                                    FontSize="14"
+                                    Foreground="#F5F5F5"
+                                    Text="{Binding Path=Name}"
+                                    TextTrimming="CharacterEllipsis" />
+
                                 <!--  Error Message  -->
-                                <TextBlock Name="error"
-                                           Grid.Row="1"
-                                           Grid.Column="1"
-                                           Margin="10,0,0,0"
-                                           VerticalAlignment="Top"
-                                           FontSize="10"
-                                           Foreground="White"
-                                           Text="{Binding Path=ErrorString}"
-                                           TextTrimming="CharacterEllipsis" />
-                                
+                                <TextBlock
+                                    Name="error"
+                                    Grid.Row="1"
+                                    Grid.Column="1"
+                                    Margin="10,0,0,0"
+                                    VerticalAlignment="Top"
+                                    FontSize="10"
+                                    Foreground="White"
+                                    Text="{Binding Path=ErrorString}"
+                                    TextTrimming="CharacterEllipsis" />
+
                                 <!--  Download State  -->
-                                <TextBlock Name="downloadState"
-                                           Grid.Row="0"
-                                           Grid.Column="2"
-                                           Margin="0,0,0,2"
-                                           VerticalAlignment="Bottom"
-                                           HorizontalAlignment="Left"
-                                           FontFamily="{StaticResource ArtifaktElementRegular}"
-                                           FontSize="10"
-                                           Foreground="#F5F5F5"
-                                           Text="{Binding Path=DownloadState, Converter={StaticResource PackageDownloadStateToStringConverter}}" />
+                                <TextBlock
+                                    Name="downloadState"
+                                    Grid.Row="0"
+                                    Grid.Column="2"
+                                    Margin="0,0,0,2"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Bottom"
+                                    FontFamily="{StaticResource ArtifaktElementRegular}"
+                                    FontSize="10"
+                                    Foreground="#F5F5F5"
+                                    Text="{Binding Path=DownloadState, Converter={StaticResource PackageDownloadStateToStringConverter}}" />
 
                                 <!--  Version  -->
-                                <TextBlock Name="version"
-                                           Grid.Row="1"
-                                           Grid.Column="2"
-                                           VerticalAlignment="Top"
-                                           FontFamily="{StaticResource ArtifaktElementRegular}"
-                                           FontSize="10"
-                                           Foreground="#F5F5F5"
-                                           Text="{Binding Path=VersionName}" />
-                                <Button Name="closeDownloadToastButton"
-                                        Grid.Row="0"
-                                        Grid.RowSpan="2"
-                                        Grid.Column="3"
-                                        Width="16"
-                                        Height="16"
-                                        Margin="10,0,0,0"
-                                        Background="{StaticResource PrimaryCharcoal300Brush}"
-                                        BorderThickness="0"
-                                        Click="CloseDownloadToastButton_OnClick"
-                                        DockPanel.Dock="Right"
-                                        Style="{StaticResource CloseButtonStyle}" />
+                                <TextBlock
+                                    Name="version"
+                                    Grid.Row="1"
+                                    Grid.Column="2"
+                                    VerticalAlignment="Top"
+                                    FontFamily="{StaticResource ArtifaktElementRegular}"
+                                    FontSize="10"
+                                    Foreground="#F5F5F5"
+                                    Text="{Binding Path=VersionName}" />
+                                <Button
+                                    Name="closeDownloadToastButton"
+                                    Grid.Row="0"
+                                    Grid.RowSpan="2"
+                                    Grid.Column="3"
+                                    Width="16"
+                                    Height="16"
+                                    Margin="10,0,0,0"
+                                    Background="{StaticResource PrimaryCharcoal300Brush}"
+                                    BorderThickness="0"
+                                    Click="CloseDownloadToastButton_OnClick"
+                                    DockPanel.Dock="Right"
+                                    Style="{StaticResource CloseButtonStyle}" />
                             </Grid>
                         </Border>
 
                         <!--  The download status flag, which changes colour to reflect the downloadState  -->
-                        <Border Name="downloadStatusFlag"
-                                Width="3"
-                                HorizontalAlignment="Left"
-                                Background="Transparent"
-                                CornerRadius="3,0,0,3" />
+                        <Border
+                            Name="downloadStatusFlag"
+                            Width="3"
+                            HorizontalAlignment="Left"
+                            Background="Transparent"
+                            CornerRadius="3,0,0,3" />
                     </Grid>
                     <DataTemplate.Triggers>
                         <DataTrigger Binding="{Binding ElementName=downloadState, Path=Text}" Value="Unknown">
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml.cs b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml.cs
index bbe99514b1e..cbfcc5b873d 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/PackageManager/PackageManagerSearchView.xaml.cs
@@ -27,6 +27,7 @@ public PackageManagerSearchView(PackageManagerSearchViewModel pm)
         {
             ViewModel = pm;
             this.DataContext = ViewModel;
+            pm.PackageManagerClientViewModel.Owner = this;
             InitializeComponent();
             ViewModel.RegisterTransientHandlers();
             ViewModel.RequestShowFileDialog += OnRequestShowFileDialog;
diff --git a/test/DynamoCoreWpfTests/PackageManagerUITests.cs b/test/DynamoCoreWpfTests/PackageManagerUITests.cs
index 57b15d93d8a..1484a46b0c5 100644
--- a/test/DynamoCoreWpfTests/PackageManagerUITests.cs
+++ b/test/DynamoCoreWpfTests/PackageManagerUITests.cs
@@ -185,7 +185,7 @@ public void PackageManagerConflictsWithbltinpackages()
             var pmVm = new PackageManagerClientViewModel(ViewModel, client);
 
             var dlgMock = new Mock<MessageBoxService.IMessageBox>();
-            dlgMock.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.Is<MessageBoxButton>(x => x == MessageBoxButton.OKCancel || x == MessageBoxButton.OK), It.IsAny<MessageBoxImage>()))
+            dlgMock.Setup(m => m.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(), It.Is<MessageBoxButton>(x => x == MessageBoxButton.OKCancel || x == MessageBoxButton.OK), It.IsAny<MessageBoxImage>()))
                 .Returns(MessageBoxResult.OK);
             MessageBoxService.OverrideMessageBoxDuringTests(dlgMock.Object);
 
@@ -218,7 +218,7 @@ public void PackageManagerConflictsWithbltinpackages()
                 // Users should get 2 warnings :
                 // 1. To confirm that they want to download the specified package.
                 // 2. That a package with the same name and version already exists as part of the BuiltinPackages.
-                dlgMock.Verify(x => x.Show(It.IsAny<string>(), It.IsAny<string>(),
+                dlgMock.Verify(x => x.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(),
                     It.IsAny<MessageBoxButton>(), It.IsAny<MessageBoxImage>()), Times.Exactly(2));
                 dlgMock.ResetCalls();
             }
@@ -255,7 +255,7 @@ public void PackageManagerConflictsWithbltinpackages()
                 // Users should get 2 warnings :
                 // 1. To confirm that they want to download the specified package.
                 // 2. That a package with a different version already exists as part of the BuiltinPackages.
-                dlgMock.Verify(x => x.Show(It.IsAny<string>(), It.IsAny<string>(),
+                dlgMock.Verify(x => x.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(),
                     It.IsAny<MessageBoxButton>(), It.IsAny<MessageBoxImage>()), Times.Exactly(2));
                 dlgMock.ResetCalls();
             }
@@ -289,7 +289,7 @@ public void PackageManagerConflictsWithbltinpackages()
 
                 // Users should get 1 warning :
                 // 1. To confirm that they want to download the specified package.
-                dlgMock.Verify(x => x.Show(It.IsAny<string>(), It.IsAny<string>(),
+                dlgMock.Verify(x => x.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(),
                     It.IsAny<MessageBoxButton>(), It.IsAny<MessageBoxImage>()), Times.Exactly(1));
                 dlgMock.ResetCalls();
             }
@@ -319,7 +319,7 @@ public void PackageManagerDepMatchesBltinPackage()
             var pmVm = new PackageManagerClientViewModel(ViewModel, client);
 
             var dlgMock = new Mock<MessageBoxService.IMessageBox>();
-            dlgMock.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), 
+            dlgMock.Setup(m => m.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(), 
                 It.Is<MessageBoxButton>(x => x == MessageBoxButton.OKCancel || x == MessageBoxButton.OK), It.IsAny<MessageBoxImage>()))
                 .Returns(MessageBoxResult.OK);
             MessageBoxService.OverrideMessageBoxDuringTests(dlgMock.Object);
@@ -383,7 +383,7 @@ public void PackageManagerDepMatchesBltinPackage()
 
             // Since the depedency is of the same version as the built-in package installed,
             // there is no further warning message, and the package will download without further user input.
-            dlgMock.Verify(x => x.Show(It.IsAny<string>(), It.IsAny<string>(),
+            dlgMock.Verify(x => x.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(),
                 It.IsAny<MessageBoxButton>(), It.IsAny<MessageBoxImage>()), Times.Exactly(1));
             dlgMock.ResetCalls();
         }
@@ -414,7 +414,7 @@ public void PackageManagerDepConflictsWithBltinPackage()
             var pmVm = new PackageManagerClientViewModel(ViewModel, client);
 
             var dlgMock = new Mock<MessageBoxService.IMessageBox>();
-            dlgMock.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(),
+            dlgMock.Setup(m => m.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(),
                 It.Is<MessageBoxButton>(x => x == MessageBoxButton.OKCancel || x == MessageBoxButton.OK), It.IsAny<MessageBoxImage>()))
                 .Returns(MessageBoxResult.OK);
             MessageBoxService.OverrideMessageBoxDuringTests(dlgMock.Object);
@@ -476,7 +476,7 @@ public void PackageManagerDepConflictsWithBltinPackage()
             // Users should get 2 warnings:
             // 1. To confirm that they want to download the specified package.
             // 2. To warn of the built-in package conflict (same name, diff version)
-            dlgMock.Verify(x => x.Show(It.IsAny<string>(), It.IsAny<string>(),
+            dlgMock.Verify(x => x.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(),
                 It.IsAny<MessageBoxButton>(), It.IsAny<MessageBoxImage>()), Times.Exactly(2));
             dlgMock.ResetCalls();
         }
@@ -503,7 +503,7 @@ public void PackageManagerDepMatchesLocalPackage()
             var pmVm = new PackageManagerClientViewModel(ViewModel, client);
 
             var dlgMock = new Mock<MessageBoxService.IMessageBox>();
-            dlgMock.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(),
+            dlgMock.Setup(m => m.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(),
                 It.Is<MessageBoxButton>(x => x == MessageBoxButton.OKCancel || x == MessageBoxButton.OK), It.IsAny<MessageBoxImage>()))
                 .Returns(MessageBoxResult.OK);
             MessageBoxService.OverrideMessageBoxDuringTests(dlgMock.Object);
@@ -567,7 +567,7 @@ public void PackageManagerDepMatchesLocalPackage()
 
             // Since the depedency is of the same version as the local package installed,
             // there is no further warning message, and the package will download without further user input.
-            dlgMock.Verify(x => x.Show(It.IsAny<string>(), It.IsAny<string>(),
+            dlgMock.Verify(x => x.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(),
                 It.IsAny<MessageBoxButton>(), It.IsAny<MessageBoxImage>()), Times.Exactly(1));
             dlgMock.ResetCalls();
         }
@@ -595,7 +595,7 @@ public void PackageManagerDepConflictsWithLocalPackage()
             var pmVm = new PackageManagerClientViewModel(ViewModel, client);
 
             var dlgMock = new Mock<MessageBoxService.IMessageBox>();
-            dlgMock.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(),
+            dlgMock.Setup(m => m.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(),
                 It.Is<MessageBoxButton>(x => x == MessageBoxButton.OKCancel || x == MessageBoxButton.OK), It.IsAny<MessageBoxImage>()))
                 .Returns(MessageBoxResult.OK);
             MessageBoxService.OverrideMessageBoxDuringTests(dlgMock.Object);
@@ -657,7 +657,7 @@ public void PackageManagerDepConflictsWithLocalPackage()
             // Users should get 2 warnings:
             // 1. To confirm that they want to download the specified package.
             // 2. To warn of the package conflict (same name, diff version)
-            dlgMock.Verify(x => x.Show(It.IsAny<string>(), It.IsAny<string>(),
+            dlgMock.Verify(x => x.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(),
                 It.IsAny<MessageBoxButton>(), It.IsAny<MessageBoxImage>()), Times.Exactly(2));
             dlgMock.ResetCalls();
         }
@@ -1005,7 +1005,7 @@ public void PackageManagerDownloadError()
             var pmVm = new PackageManagerClientViewModel(ViewModel, client);
 
             var dlgMock = new Mock<MessageBoxService.IMessageBox>();
-            dlgMock.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.Is<MessageBoxButton>(x => x == MessageBoxButton.OKCancel || x == MessageBoxButton.OK), It.IsAny<MessageBoxImage>()))
+            dlgMock.Setup(m => m.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(), It.Is<MessageBoxButton>(x => x == MessageBoxButton.OKCancel || x == MessageBoxButton.OK), It.IsAny<MessageBoxImage>()))
                 .Returns(MessageBoxResult.OK);
             MessageBoxService.OverrideMessageBoxDuringTests(dlgMock.Object);
 
@@ -1033,7 +1033,7 @@ public void PackageManagerDownloadError()
                 // Users should get 2 warnings :
                 // 1. To confirm that they want to download the specified package.
                 // 2. That a package with the same name and version already exists as part of the BuiltinPackages.
-                dlgMock.Verify(x => x.Show(string.Format(Dynamo.Wpf.Properties.Resources.MessageFailedToDownloadPackageVersion, version, id),
+                dlgMock.Verify(x => x.Show(It.IsAny<Window>(), string.Format(Dynamo.Wpf.Properties.Resources.MessageFailedToDownloadPackageVersion, version, id),
                             Dynamo.Wpf.Properties.Resources.PackageDownloadErrorMessageBoxTitle,
                             MessageBoxButton.OK, MessageBoxImage.Error), Times.Exactly(1));
             }
@@ -1127,7 +1127,7 @@ public void PackageManagerDownloadsBeforeInstalling()
 
             var dlgMock = new Mock<MessageBoxService.IMessageBox>();
             //click ok during download.
-            dlgMock.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.Is<MessageBoxButton>(x => x == MessageBoxButton.OKCancel || x == MessageBoxButton.OK), It.IsAny<MessageBoxImage>()))
+            dlgMock.Setup(m => m.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(), It.Is<MessageBoxButton>(x => x == MessageBoxButton.OKCancel || x == MessageBoxButton.OK), It.IsAny<MessageBoxImage>()))
                 .Returns(MessageBoxResult.OK);
             MessageBoxService.OverrideMessageBoxDuringTests(dlgMock.Object);
 
@@ -1195,7 +1195,7 @@ public void PackageManagerConflictsUnloadedWithBltInPackage()
             var pmVm = new PackageManagerClientViewModel(ViewModel, client);
 
             var dlgMock = new Mock<MessageBoxService.IMessageBox>();
-            dlgMock.Setup(m => m.Show(It.IsAny<string>(), It.IsAny<string>(), It.Is<MessageBoxButton>(x => x == MessageBoxButton.OKCancel || x == MessageBoxButton.OK), It.IsAny<MessageBoxImage>()))
+            dlgMock.Setup(m => m.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(), It.Is<MessageBoxButton>(x => x == MessageBoxButton.OKCancel || x == MessageBoxButton.OK), It.IsAny<MessageBoxImage>()))
                 .Returns(MessageBoxResult.OK);
             MessageBoxService.OverrideMessageBoxDuringTests(dlgMock.Object);
 
@@ -1230,7 +1230,7 @@ public void PackageManagerConflictsUnloadedWithBltInPackage()
 
                 // Users should get 1 warning :
                 // 1. To confirm that they want to download the specified package.
-                dlgMock.Verify(x => x.Show(It.IsAny<string>(), It.IsAny<string>(),
+                dlgMock.Verify(x => x.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(),
                     It.IsAny<MessageBoxButton>(), It.IsAny<MessageBoxImage>()), Times.Exactly(1));
                 dlgMock.ResetCalls();
             }
@@ -1300,8 +1300,7 @@ public void PackageManagerErrorStatePackages()
                 // Users should get 1 warnings :
                 // 1. To confirm that they want to download the specified package.
                 // 2. That a package with the same name and version already exists.
-                dlgMock.Verify(x => x.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButton>(), It.IsAny<MessageBoxImage>()), Times.Exactly(1));
-                dlgMock.Verify(x => x.Show(It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButton>(), It.IsAny<string[]>(), It.IsAny<MessageBoxImage>()), Times.Exactly(1));
+                dlgMock.Verify(x => x.Show(It.IsAny<Window>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<MessageBoxButton>(), It.IsAny<MessageBoxImage>()), Times.Exactly(1));
                 dlgMock.ResetCalls();
             }
         }