diff --git a/BodyshopUploader/ImEXOnlinePartner.csproj b/BodyshopUploader/ImEXOnlinePartner.csproj
index bdc7146..3d6f182 100644
--- a/BodyshopUploader/ImEXOnlinePartner.csproj
+++ b/BodyshopUploader/ImEXOnlinePartner.csproj
@@ -305,7 +305,7 @@
       <Version>1.1.0</Version>
     </PackageReference>
     <PackageReference Include="MaterialDesignThemes">
-      <Version>4.0.0</Version>
+      <Version>4.1.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CSharp">
       <Version>4.7.0</Version>
diff --git a/BodyshopUploader/Properties/AssemblyInfo.cs b/BodyshopUploader/Properties/AssemblyInfo.cs
index a7e5348..5870c91 100644
--- a/BodyshopUploader/Properties/AssemblyInfo.cs
+++ b/BodyshopUploader/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.12.0")]
+[assembly: AssemblyVersion("1.0.18.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
 //Setting Squirrel Aware Version.
 [assembly: AssemblyMetadata("SquirrelAwareVersion", "1")]
\ No newline at end of file
diff --git a/BodyshopUploader/ViewModels/MainViewModel.commands.cs b/BodyshopUploader/ViewModels/MainViewModel.commands.cs
index e5624bb..e950439 100644
--- a/BodyshopUploader/ViewModels/MainViewModel.commands.cs
+++ b/BodyshopUploader/ViewModels/MainViewModel.commands.cs
@@ -35,7 +35,8 @@ namespace BodyshopPartner.ViewModels
                         p => true,
                         p =>
                         {
-                            ((Window)p).Show();
+                            App.Current.MainWindow.Show();
+                           // ((Window)p).Show();
 
 
                         }
diff --git a/BodyshopUploader/ViewModels/MainViewModel.cs b/BodyshopUploader/ViewModels/MainViewModel.cs
index 8fe033b..bac25da 100644
--- a/BodyshopUploader/ViewModels/MainViewModel.cs
+++ b/BodyshopUploader/ViewModels/MainViewModel.cs
@@ -90,7 +90,7 @@ namespace BodyshopPartner.ViewModels
         private async Task updateCheck()
         {
 
-//#if (!DEBUG)
+#if (!DEBUG)
             logger.Debug("Checking if updates are available.");
             await Utils.UpdateHandler.UpdateAppEasy((val) => UpdateProgress = val);
 
@@ -111,7 +111,7 @@ namespace BodyshopPartner.ViewModels
 
             //    }
             //}
-//#endif
+#endif
 
         }
 
diff --git a/BodyshopUploader/Views/Main.xaml b/BodyshopUploader/Views/Main.xaml
index 323e19a..64384af 100644
--- a/BodyshopUploader/Views/Main.xaml
+++ b/BodyshopUploader/Views/Main.xaml
@@ -58,7 +58,7 @@
         <tb:TaskbarIcon DockPanel.Dock="Top"
                         IconSource="../favicon.ico"
                         DoubleClickCommand="{Binding OpenMainWindowCommand}"
-                        DoubleClickCommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
+                        DoubleClickCommandParameter="{Binding ElementName=MainWindow}"
                         PopupActivation="LeftClick"
                         MenuActivation="RightClick">
             <!--<tb:TaskbarIcon.TrayPopup>
@@ -101,7 +101,7 @@
                 <ContextMenu>
                     <MenuItem Header="{x:Static p:Resources.Label_Show}"
                               Command="{Binding OpenMainWindowCommand}"
-                              CommandParameter="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}" />
+                              CommandParameter="{Binding ElementName=MainWindow}" />
                     <MenuItem Header="{x:Static p:Resources.Label_Restart}"
                               Command="{Binding StartFolderMonitorsCommand}" />
                     <MenuItem Header="{x:Static p:Resources.Label_StopAllMonitors}"
@@ -211,7 +211,7 @@
                                             Margin="4"
                                             Content="{x:Static p:Resources.Label_Remove}" />
                                     <Button Command="{Binding DataContext.RestartMonitoringPathCommand,
-                                        RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"
+                                       ElementName=MainWindow }"
                                             CommandParameter="{Binding .}"
                                             Style="{StaticResource MaterialDesignOutlinedButton}"
                                             Margin="4"