diff --git a/VTOL_2.0.0/.vs/VTOL/DesignTimeBuild/.dtbcache.v2 b/VTOL_2.0.0/.vs/VTOL/DesignTimeBuild/.dtbcache.v2
index 2be3ff1..07d61e8 100644
Binary files a/VTOL_2.0.0/.vs/VTOL/DesignTimeBuild/.dtbcache.v2 and b/VTOL_2.0.0/.vs/VTOL/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/2d2edd9a-54a8-4e2d-bf3b-af8fe19ac5b0.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/2d2edd9a-54a8-4e2d-bf3b-af8fe19ac5b0.vsidx
deleted file mode 100644
index f438616..0000000
Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/2d2edd9a-54a8-4e2d-bf3b-af8fe19ac5b0.vsidx and /dev/null differ
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/47f4253a-2c32-4d1c-acc8-f40e268b2b96.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/47f4253a-2c32-4d1c-acc8-f40e268b2b96.vsidx
new file mode 100644
index 0000000..7ae5984
Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/47f4253a-2c32-4d1c-acc8-f40e268b2b96.vsidx differ
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/4a7e761e-fb9b-4f5e-b13f-c6c6432cb9e1.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/4a7e761e-fb9b-4f5e-b13f-c6c6432cb9e1.vsidx
deleted file mode 100644
index ae341f9..0000000
Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/4a7e761e-fb9b-4f5e-b13f-c6c6432cb9e1.vsidx and /dev/null differ
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/7735284d-7061-42fa-a89e-fa331021b6bf.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/7735284d-7061-42fa-a89e-fa331021b6bf.vsidx
new file mode 100644
index 0000000..5aefbc8
Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/7735284d-7061-42fa-a89e-fa331021b6bf.vsidx differ
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/7ab99bd7-856c-400c-8993-0161ca84f466.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/7ab99bd7-856c-400c-8993-0161ca84f466.vsidx
deleted file mode 100644
index 3c201a2..0000000
Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/7ab99bd7-856c-400c-8993-0161ca84f466.vsidx and /dev/null differ
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/8137f803-a7d0-4ab2-a7c4-88164052ce75.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/8137f803-a7d0-4ab2-a7c4-88164052ce75.vsidx
new file mode 100644
index 0000000..158f50b
Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/8137f803-a7d0-4ab2-a7c4-88164052ce75.vsidx differ
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/b4066d88-c965-4d40-ae5a-dbc545ab0fb1.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/b4066d88-c965-4d40-ae5a-dbc545ab0fb1.vsidx
new file mode 100644
index 0000000..b6cdac3
Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/b4066d88-c965-4d40-ae5a-dbc545ab0fb1.vsidx differ
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/d303b3f3-6bc0-4339-9558-5687174b967b.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/d303b3f3-6bc0-4339-9558-5687174b967b.vsidx
new file mode 100644
index 0000000..3c8d5f6
Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/d303b3f3-6bc0-4339-9558-5687174b967b.vsidx differ
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/d66e39a6-c616-4397-8bc2-eccc24921346.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/d66e39a6-c616-4397-8bc2-eccc24921346.vsidx
deleted file mode 100644
index 8962599..0000000
Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/d66e39a6-c616-4397-8bc2-eccc24921346.vsidx and /dev/null differ
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/ddd29168-9794-42bd-bbb6-6fff96bbe311.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/ddd29168-9794-42bd-bbb6-6fff96bbe311.vsidx
deleted file mode 100644
index ec22faf..0000000
Binary files a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/ddd29168-9794-42bd-bbb6-6fff96bbe311.vsidx and /dev/null differ
diff --git a/VTOL_2.0.0/MainWindow.xaml b/VTOL_2.0.0/MainWindow.xaml
index dfa39c6..ea14eba 100644
--- a/VTOL_2.0.0/MainWindow.xaml
+++ b/VTOL_2.0.0/MainWindow.xaml
@@ -134,14 +134,7 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <hc:Badge x:Name="VTOL_UPDATE_BADGE" Margin="0,460,0,204" BadgeMargin="32,4,10,0" Status="Processing" ToolTip="Update For VTOL Available" BorderBrush="#FF00FF84" HorizontalAlignment="Right" Width="52" Visibility="Hidden">
-            <hc:Badge.Background>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#FF00FF9C" Offset="0.005"/>
-                    <GradientStop Color="#FF00A455" Offset="1"/>
-                </LinearGradientBrush>
-            </hc:Badge.Background>
-        </hc:Badge>
+        <hc:Badge x:Name="VTOL_UPDATE_BADGE" Margin="0,399,0,265" BadgeMargin="32,4,10,0" Status="Processing" ToolTip="Update For VTOL Available" BorderBrush="#FF5EFFC6" HorizontalAlignment="Center" Width="52" Visibility="Hidden" Background="#FF5EFFC6" Foreground="#FFFDFDFD"/>
         <ui:NotifyIcon
                     Icon="/Resources/Icons/Main_UI/VTOL_multires.ico"
                     MenuOnRightClick="True"
@@ -200,7 +193,7 @@
                 x:Name="mask"
                CornerRadius="8" Background="#FF0E0E0E"
             />
-               
+
                 <Frame x:Name="RootFrame" GotFocus="RootFrame_GotFocus">
                     <Frame.OpacityMask>
                         <VisualBrush Visual="{Binding ElementName=mask}"/>
diff --git a/VTOL_2.0.0/Pages/Page_Mods.xaml b/VTOL_2.0.0/Pages/Page_Mods.xaml
index 49f3a48..7f39978 100644
--- a/VTOL_2.0.0/Pages/Page_Mods.xaml
+++ b/VTOL_2.0.0/Pages/Page_Mods.xaml
@@ -10,7 +10,7 @@
  xmlns:parallax="clr-namespace:Parallax.WPF"
       xmlns:I="http://schemas.microsoft.com/xaml/behaviors"
       d:DesignHeight="670" d:DesignWidth="1148"
-      Title="Page_Mods" KeepAlive="True" Unloaded="Page_Unloaded">
+      Title="Page_Mods" KeepAlive="True" Unloaded="Page_Unloaded" Initialized="Page_Initialized" Loaded="Page_Loaded">
     <Page.Resources>
         <Style TargetType="Image">
 
diff --git a/VTOL_2.0.0/Pages/Page_Mods.xaml.cs b/VTOL_2.0.0/Pages/Page_Mods.xaml.cs
index 414b66e..3d9425a 100644
--- a/VTOL_2.0.0/Pages/Page_Mods.xaml.cs
+++ b/VTOL_2.0.0/Pages/Page_Mods.xaml.cs
@@ -164,18 +164,8 @@ public Page_Mods()
             InitializeComponent();
             User_Settings_Vars = Main.User_Settings_Vars;
             Snackbar = Main.Snackbar;
-
-            BackgroundWorker worker = new BackgroundWorker();
-            worker.DoWork += (sender, e) =>
-            {
-                //  Call_Mods_From_Folder();
-                Check_Reverse(false);
-
-
-
-            };
-
-            worker.RunWorkerAsync();
+           
+          
 
 
 
@@ -576,10 +566,7 @@ public async Task Call_Mods_From_Folder()
                                         }
                                         catch (Exception ex)
                                         {
-                                            Console.WriteLine(ex);
-
-                                            Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
-
+                                           
                                         }
                                     }
                                     Main.loaded_mods = true;
@@ -604,7 +591,6 @@ public async Task Call_Mods_From_Folder()
             }
             catch (Exception ex)
             {
-                Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
             }
 
 
@@ -932,29 +918,26 @@ private void ApplyDataBinding()
             try
             {
                 Mod_List_Box.ItemsSource = null;
+                _Completed_Mod_call = true;
+                var sorted = Keep_List_State(false, Reverse_);
+                Mod_List_Box.ItemsSource = sorted;
+                _Completed_Mod_call = true;
 
                 if (Search_Bar_Suggest_Mods.Text.Trim() != "" && Search_Bar_Suggest_Mods.Text.Trim() != "~Search")
                 {
-                    var sorted = Keep_List_State(true, Reverse_);
-                    Mod_List_Box.ItemsSource = sorted;
-                    _Completed_Mod_call = true;
+                     sorted = Keep_List_State(true, Reverse_);
+
                 }
-                else
-                {
+                Mod_List_Box.Refresh();
+
 
-                    var sorted = Keep_List_State(false, Reverse_);
-                    Mod_List_Box.ItemsSource = sorted;
 
-                    _Completed_Mod_call = true;
 
 
-                }
 
-                Mod_List_Box.Refresh();
             }
             catch (Exception ex)
             {
-                Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
 
             }
         }
@@ -2108,23 +2091,18 @@ protected virtual void Delete_Action(object sender, RoutedEventArgs e)
                 }
 
                 string delete_mod_path = Dialog.Tag.ToString();
-                if (!Directory.Exists(temp_Dir))
+                if (Directory.Exists(temp_Dir))
                 {
-                    Dialog.Hide();
 
-                    //Send_Success_Notif("Successfully Deleted - " + Mod);
-                    Call_Mods_From_Folder();
-                }
-                else
-                {
                     TryDeleteDirectory(temp_Dir, true);
 
-                    Dialog.Hide();
+                }
 
-                    //Send_Error_Notif("Could not Delete! - " + Mod);
-                    Call_Mods_From_Folder();
 
-                }
+                Dialog.Hide();
+
+                Call_Mods_From_Folder();
+
                 temp_Dir = null;
             }
             catch (Exception ex)
@@ -2266,16 +2244,7 @@ private void CardControl_MouseMove(object sender, MouseEventArgs e)
 
         private void Mod_Grid_Loaded(object sender, RoutedEventArgs e)
         {
-            try
-            {
-                Call_Mods_From_Folder();
-            }
-            catch (Exception ex)
-            {
-
-                Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
-
-            }
+            
         }
 
         private void Mod_Grid_Unloaded(object sender, RoutedEventArgs e)
@@ -2749,5 +2718,37 @@ private void INFO_VERSION_MOD_SET_LayoutUpdated(object sender, EventArgs e)
         {
 
         }
+
+        private void Page_Initialized(object sender, EventArgs e)
+        {
+
+        }
+
+        private void Page_Loaded(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                BackgroundWorker worker = new BackgroundWorker();
+                worker.DoWork += (sender, e) =>
+                {
+
+
+
+                    Call_Mods_From_Folder();
+
+                    Check_Reverse(false);
+                    GC.Collect();
+
+
+                };
+
+                worker.RunWorkerAsync();
+
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
     }
 }
diff --git a/VTOL_2.0.0/Pages/Page_Thunderstore.xaml b/VTOL_2.0.0/Pages/Page_Thunderstore.xaml
index 3e00a18..f0b9bca 100644
--- a/VTOL_2.0.0/Pages/Page_Thunderstore.xaml
+++ b/VTOL_2.0.0/Pages/Page_Thunderstore.xaml
@@ -10,7 +10,7 @@
 	          xmlns:cntrls="clr-namespace:VTOL"
 
       d:DesignHeight="670" d:DesignWidth="1148"
-      Title="Page_Thunderstore" UseLayoutRounding="True" Loaded="Page_Loaded_1" Unloaded="Page_Unloaded">
+      Title="Page_Thunderstore" UseLayoutRounding="True" Loaded="Page_Loaded_1" Unloaded="Page_Unloaded" >
     <Page.Resources>
         <local:NegatingConverter x:Key="NegatingConverter" />
         <Storyboard x:Key="slide">
diff --git a/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs b/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs
index 97a7853..fa33ea1 100644
--- a/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs
+++ b/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs
@@ -677,20 +677,20 @@ public Page_Thunderstore()
             {
 
                 CookFaveMods();
-                if (Main.loaded_mods == false) { 
-                Call_Mods_From_Folder_Lite();
-            }
+                if (Main.loaded_mods == false) {
+                    Call_Mods_From_Folder_Lite();
+                }
                 Call_Ts_Mods();
-               
+
 
             };
             worker.RunWorkerCompleted += (sender, eventArgs) =>
             {
                 DispatchIfNecessary(async () =>
                 {
-                    if(_updater != null)
+                    if (_updater != null)
                     {
-                        Couunter_Mods.Content = VTOL.Resources.Languages.Language.ThunderstoreModCount +":"+ _updater.Thunderstore.Count().ToString();
+                        Couunter_Mods.Content = VTOL.Resources.Languages.Language.ThunderstoreModCount + ":" + _updater.Thunderstore.Count().ToString();
 
                     }
 
@@ -1117,7 +1117,7 @@ private void Search_Bar_Suggest_Mods_GotFocus(object sender, RoutedEventArgs e)
         {
             DispatchIfNecessary(async () =>
             {
-                
+
                 Search_Bar_Suggest_Mods.IsReadOnly = false;
 
                 Sort.SelectedIndex = -1;
@@ -1138,8 +1138,8 @@ private void Search_Bar_Suggest_Mods_LostFocus(object sender, RoutedEventArgs e)
                 // Search_Bar_Suggest_Mods.IconForeground = (SolidColorBrush)new BrushConverter().ConvertFrom("#34FFFFFF");
             });
         }
-        string old_text="";
-        
+        string old_text = "";
+
         private void Grid_MouseLeave(object sender, MouseEventArgs e)
         {
             DispatchIfNecessary(async () =>
@@ -1177,20 +1177,19 @@ private void Grid_MouseLeave(object sender, MouseEventArgs e)
             });
         }
 
-       
+
 
 
         protected void SomeWorkerThread(object o)
         {
-         
-            DispatchIfNecessary(async () =>
+
+
+            foreach (var TS_MOD in _updater.Thunderstore)
             {
-                foreach (var TS_MOD in _updater.Thunderstore)
-                {
-                    AsyncLoadListViewItem(TS_MOD, false, "#");
-                }
-            });
-         
+                AsyncLoadListViewItem(TS_MOD, false, "#");
+            }
+
+
         }
         public async Task Call_Ts_Mods()
         {
@@ -1204,8 +1203,8 @@ public async Task Call_Ts_Mods()
                 List<Grid_> List = null;
                 _updater = new Updater("https://northstar.thunderstore.io/api/v1/package/");
 
-                    _updater.Download_Cutom_JSON();
-                    if (_updater.Thunderstore != null)
+                _updater.Download_Cutom_JSON();
+                if (_updater.Thunderstore != null)
                 {
                     if (_updater.Thunderstore.Count() > 0)
                     {
@@ -1214,18 +1213,18 @@ public async Task Call_Ts_Mods()
                             Thunderstore_List.Items.Clear();
                             Thread t = new Thread(new ParameterizedThreadStart(SomeWorkerThread));
                             t.Start();
+                            GC.Collect();
 
 
                         });
 
 
                     }
-                   
+
                 }
 
 
                 init = true;
-                GC.Collect();
 
 
 
@@ -1246,7 +1245,7 @@ static int versionCompare(string v1, string v2)
             // part of version
 
             int vnum1 = 0, vnum2 = 0;
-            if(v1 == null || v2 == null) { return 3; }
+            if (v1 == null || v2 == null) { return 3; }
             // loop until both string are
             // processed
 
@@ -1426,7 +1425,7 @@ private void padd_Click(object sender, RoutedEventArgs e)
 
                 if (Sort.SelectedItem != null)
                 {
-                  //  Thunderstore_List.ItemsSource = null;
+                    //  Thunderstore_List.ItemsSource = null;
 
                     BackgroundWorker worker = new BackgroundWorker();
                     worker.DoWork += (sender, e) =>
@@ -1454,7 +1453,7 @@ private void padd_Click(object sender, RoutedEventArgs e)
                     worker.RunWorkerCompleted += (sender, eventArgs) =>
                     {
 
-                      //  Thunderstore_List.Items.Refresh();
+                        //  Thunderstore_List.Items.Refresh();
 
 
                     };
@@ -1768,15 +1767,15 @@ public void orderlistitems()
 
                             break;
                         case "...":
-                             Main.Page_reset_ = true;
+                            Main.Page_reset_ = true;
 
                             break;
                         default:
-                            List = itemsList; 
+                            List = itemsList;
                             break;
 
 
-                    }                
+                    }
 
                 }
                 else
@@ -1833,7 +1832,7 @@ public void orderlistitems()
                         default:
                             List = itemsList;
                             break;
-                    }                
+                    }
                 }
             }
             DispatchIfNecessary(async () =>
@@ -1876,7 +1875,7 @@ private void AsyncLoadListViewItem(Thunderstore_V1 updater, bool Search_ = false
             string Update_data = "";
             string Button_label = "";
             string MOD_Name = "";
-            
+
             if (updater.FullName.Contains("r2modman"))
             {
                 return;
@@ -1901,7 +1900,7 @@ private void AsyncLoadListViewItem(Thunderstore_V1 updater, bool Search_ = false
                 return;
             }
 
-                foreach (var items in versions)
+            foreach (var items in versions)
             {
 
                 Downloads.Add(Convert.ToInt32(items.Downloads));
@@ -1918,7 +1917,7 @@ private void AsyncLoadListViewItem(Thunderstore_V1 updater, bool Search_ = false
 
                 if (updater.Categories.Select(x => x).Intersect(Current_Mod_Filter_Tags).Any())
                 {
-                    if (Search_ == true && SearchQuery !="#")
+                    if (Search_ == true && SearchQuery != "#")
                     {
 
 
@@ -1991,23 +1990,23 @@ private void AsyncLoadListViewItem(Thunderstore_V1 updater, bool Search_ = false
                         {
                             if (Card != null)
                             {
-                                Card = (new Grid_ { NameSpace = Split_Name[0], 
-                                    Name = MOD_Name.Replace("_", " ") + "-" + versions.First().VersionNumber, 
+                                Card = (new Grid_ { NameSpace = Split_Name[0],
+                                    Name = MOD_Name.Replace("_", " ") + "-" + versions.First().VersionNumber,
                                     Icon = ICON,
                                     raw_date = updater.DateCreated.ToString(),
-                                    date_created = ConvertDateToString(updater.DateCreated), 
-                                    description = Descrtiption, 
-                                    owner = updater.Owner, 
-                                    Rating = rating, 
-                                    download_url = download_url + "|" + versions.First().FullName  + "|" + Tags + "|" + Dependencies_ +"|" + Split_Name[0],
-                                    Webpage = updater.PackageUrl, 
-                                    File_Size = FileSize, 
-                                    Tag = Tags, 
-                                    Downloads = downloads, 
-                                    Dependencies = Dependencies_, 
-                                    FullName = versions.First().FullName, 
-                                    raw_size = raw_size, 
-                                    Update_data = MOD_Name + "|" + versions.First().VersionNumber, Button_label = label, 
+                                    date_created = ConvertDateToString(updater.DateCreated),
+                                    description = Descrtiption,
+                                    owner = updater.Owner,
+                                    Rating = rating,
+                                    download_url = download_url + "|" + versions.First().FullName + "|" + Tags + "|" + Dependencies_ + "|" + Split_Name[0],
+                                    Webpage = updater.PackageUrl,
+                                    File_Size = FileSize,
+                                    Tag = Tags,
+                                    Downloads = downloads,
+                                    Dependencies = Dependencies_,
+                                    FullName = versions.First().FullName,
+                                    raw_size = raw_size,
+                                    Update_data = MOD_Name + "|" + versions.First().VersionNumber, Button_label = label,
                                     Button_Color = bg_color, is_Favourite_ = is_favourite });
 
                                 Thunderstore_List.Items.Add(Card);
@@ -2073,23 +2072,23 @@ private void AsyncLoadListViewItem(Thunderstore_V1 updater, bool Search_ = false
                             {
                                 Card = (new Grid_ { NameSpace = Split_Name[0],
                                     Name = MOD_Name.Replace("_", " ") + "-" + versions.First().VersionNumber,
-                                    Icon = ICON, 
-                                    raw_date = updater.DateCreated.ToString(), 
-                                    date_created = ConvertDateToString(updater.DateCreated), 
-                                    description = Descrtiption, 
+                                    Icon = ICON,
+                                    raw_date = updater.DateCreated.ToString(),
+                                    date_created = ConvertDateToString(updater.DateCreated),
+                                    description = Descrtiption,
                                     owner = updater.Owner,
                                     Rating = rating,
-                                    download_url = download_url + "|" + versions.First().FullName  + "|" + Tags + "|" + Dependencies_ + "|" + Split_Name[0], 
-                                    Webpage = updater.PackageUrl, 
+                                    download_url = download_url + "|" + versions.First().FullName + "|" + Tags + "|" + Dependencies_ + "|" + Split_Name[0],
+                                    Webpage = updater.PackageUrl,
                                     File_Size = FileSize,
-                                    Tag = Tags, 
+                                    Tag = Tags,
                                     Downloads = downloads,
                                     Dependencies = Dependencies_,
-                                    FullName = versions.First().FullName, 
+                                    FullName = versions.First().FullName,
                                     raw_size = raw_size,
                                     Update_data = MOD_Name + "|" + versions.First().VersionNumber,
-                                    Button_label = label, 
-                                    Button_Color = bg_color, 
+                                    Button_label = label,
+                                    Button_Color = bg_color,
                                     is_Favourite_ = is_favourite });
                                 Thunderstore_List.Items.Add(Card);
                                 DispatchIfNecessary(async () =>
@@ -2190,25 +2189,25 @@ private void AsyncLoadListViewItem(Thunderstore_V1 updater, bool Search_ = false
                         // is_nsfw = updater.HasNsfwContent ? 100 : 0;
                         if (Card != null)
                         {
-                            Card = (new Grid_ { NameSpace = Split_Name[0], 
-                                Name = MOD_Name.Replace("_", " ") + "-" + versions.First().VersionNumber, 
-                                Icon = ICON, 
+                            Card = (new Grid_ { NameSpace = Split_Name[0],
+                                Name = MOD_Name.Replace("_", " ") + "-" + versions.First().VersionNumber,
+                                Icon = ICON,
                                 raw_date = updater.DateCreated.ToString(),
-                                date_created = ConvertDateToString(updater.DateCreated), 
-                                description = Descrtiption, 
-                                owner = updater.Owner, 
-                                Rating = rating, 
-                                download_url = download_url + "|" + versions.First().FullName  + "|" + Tags + "|" + Dependencies_ + "|" + Split_Name[0], 
-                                Webpage = updater.PackageUrl, 
-                                File_Size = FileSize, 
-                                Tag = Tags, 
-                                Downloads = downloads, 
+                                date_created = ConvertDateToString(updater.DateCreated),
+                                description = Descrtiption,
+                                owner = updater.Owner,
+                                Rating = rating,
+                                download_url = download_url + "|" + versions.First().FullName + "|" + Tags + "|" + Dependencies_ + "|" + Split_Name[0],
+                                Webpage = updater.PackageUrl,
+                                File_Size = FileSize,
+                                Tag = Tags,
+                                Downloads = downloads,
                                 Dependencies = Dependencies_,
-                                FullName = versions.First().FullName, 
-                                raw_size = raw_size, 
-                                Update_data = MOD_Name + "|" + versions.First().VersionNumber, 
-                                Button_label = label, 
-                                Button_Color = bg_color, 
+                                FullName = versions.First().FullName,
+                                raw_size = raw_size,
+                                Update_data = MOD_Name + "|" + versions.First().VersionNumber,
+                                Button_label = label,
+                                Button_Color = bg_color,
                                 is_Favourite_ = is_favourite });
                             Thunderstore_List.Items.Add(Card);
                             DispatchIfNecessary(async () =>
@@ -2225,8 +2224,8 @@ private void AsyncLoadListViewItem(Thunderstore_V1 updater, bool Search_ = false
 
 
                 }
-                    else
-                    {
+                else
+                {
 
 
 
@@ -2235,23 +2234,23 @@ private void AsyncLoadListViewItem(Thunderstore_V1 updater, bool Search_ = false
 
 
 
-                        downloads = (Downloads.Sum()).ToString();
-                        
-                        for (var x = 0; x < versions.First().Dependencies.Count; x++)
-                        {
-                            if (versions.First().Dependencies[x].Contains("northstar-Northstar") || versions.First().Dependencies[x].Contains("ebkr-r2modman-"))
-                            {
+                    downloads = (Downloads.Sum()).ToString();
 
-                                continue;
-                            }
-                            else
-                            {
-                                Dependencies.Add(versions.First().Dependencies[x]);
+                    for (var x = 0; x < versions.First().Dependencies.Count; x++)
+                    {
+                        if (versions.First().Dependencies[x].Contains("northstar-Northstar") || versions.First().Dependencies[x].Contains("ebkr-r2modman-"))
+                        {
 
-                            }
+                            continue;
+                        }
+                        else
+                        {
+                            Dependencies.Add(versions.First().Dependencies[x]);
 
                         }
-                    
+
+                    }
+
 
                     download_url = versions.First().DownloadUrl;
 
@@ -2259,7 +2258,7 @@ private void AsyncLoadListViewItem(Thunderstore_V1 updater, bool Search_ = false
                     FileSize = versions.First().FileSize.ToString();
                     Descrtiption = versions.First().Description;
                     Dependencies_ = String.Join(", ", Dependencies);
-                    if(Dependencies_.Length <= 1)
+                    if (Dependencies_.Length <= 1)
                     {
                         Dependencies_ = "-";
                     }
@@ -2303,25 +2302,25 @@ private void AsyncLoadListViewItem(Thunderstore_V1 updater, bool Search_ = false
                         // is_nsfw = updater.HasNsfwContent ? 100 : 0;
                         if (Card != null)
                         {
-                            Card = (new Grid_ { NameSpace = Split_Name[0], 
-                                Name = MOD_Name.Replace("_", " ") + "-" + versions.First().VersionNumber, 
+                            Card = (new Grid_ { NameSpace = Split_Name[0],
+                                Name = MOD_Name.Replace("_", " ") + "-" + versions.First().VersionNumber,
                                 Icon = ICON,
                                 raw_date = updater.DateCreated.ToString(),
-                                date_created = ConvertDateToString(updater.DateCreated), 
-                                description = Descrtiption, 
-                                owner = updater.Owner, 
-                                Rating = rating, 
-                                download_url = download_url + "|" + versions.First().FullName + "|" + Tags + "|" + Dependencies_ + "|" + Split_Name[0], 
-                                Webpage = updater.PackageUrl, 
+                                date_created = ConvertDateToString(updater.DateCreated),
+                                description = Descrtiption,
+                                owner = updater.Owner,
+                                Rating = rating,
+                                download_url = download_url + "|" + versions.First().FullName + "|" + Tags + "|" + Dependencies_ + "|" + Split_Name[0],
+                                Webpage = updater.PackageUrl,
                                 File_Size = FileSize,
-                                Tag = Tags, 
-                                Downloads = downloads, 
+                                Tag = Tags,
+                                Downloads = downloads,
                                 Dependencies = Dependencies_,
-                                FullName = versions.First().FullName, 
+                                FullName = versions.First().FullName,
                                 raw_size = raw_size,
-                                Update_data = MOD_Name + "|" + versions.First().VersionNumber, 
+                                Update_data = MOD_Name + "|" + versions.First().VersionNumber,
                                 Button_label = label,
-                                Button_Color = bg_color, 
+                                Button_Color = bg_color,
                                 is_Favourite_ = is_favourite });
                             Thunderstore_List.Items.Add(Card);
                             DispatchIfNecessary(async () =>
@@ -2334,11 +2333,11 @@ private void AsyncLoadListViewItem(Thunderstore_V1 updater, bool Search_ = false
                     });
                 }
             }
-        //}
-        //    catch (Exception ex)
-        //        {
-        //        Console.WriteLine(ex.Source+"\n\n\n" + ex.Message);
-        //    }
+            //}
+            //    catch (Exception ex)
+            //        {
+            //        Console.WriteLine(ex.Source+"\n\n\n" + ex.Message);
+            //    }
 
 
 
@@ -2408,8 +2407,8 @@ private void loadConvertItemLazy(bool Search_ = false, string SearchQuery = "#")
             //}
             foreach (var TS_MOD in _updater.Thunderstore)
             {
-                    AsyncLoadListViewItem(TS_MOD, Search_, SearchQuery.Replace(" ", "_"));
-              
+                AsyncLoadListViewItem(TS_MOD, Search_, SearchQuery.Replace(" ", "_"));
+
                 //Legacy Grid_ Card = LoadListViewItem(TS_MOD, Search_, SearchQuery.Replace(" ", "_"));
                 //    if (Card != null)
                 //    {
@@ -2421,7 +2420,7 @@ private void loadConvertItemLazy(bool Search_ = false, string SearchQuery = "#")
             }
         }
 
-        
+
         public string Search_For_Mod_Thunderstore(string SearchQuery = "None")
 
         {
@@ -2454,7 +2453,7 @@ public string Search_For_Mod_Thunderstore(string SearchQuery = "None")
             }
             return null;
         }
-        
+
         public class Action_Card
         {
             public string Date { get; set; }
@@ -2541,7 +2540,7 @@ async void downloader_DownloadCompleted(object sender, AsyncCompletedEventArgs e
         {
             if (NS_CANDIDATE_INSTALL == true)
             {
-                await Unpack_To_Location_Custom(Location, User_Settings_Vars.NorthstarInstallLocation + @"Northstar_TEMP_FILES\", Progress_Bar, true, false, Plugin_Install, NS_CANDIDATE_INSTALL, Mod_Name,NameSpace);
+                await Unpack_To_Location_Custom(Location, User_Settings_Vars.NorthstarInstallLocation + @"Northstar_TEMP_FILES\", Progress_Bar, true, false, Plugin_Install, NS_CANDIDATE_INSTALL, Mod_Name, NameSpace);
 
             }
             else
@@ -2576,16 +2575,16 @@ await Task.Run(() =>
                             return;
                         }
 
-                             downloader = DownloadBuilder.New()
-           .WithUrl(words[0])
-           .WithDirectory(path)
-           .WithFileName(item_.Name + ".zip")
-           .WithConfiguration(new DownloadConfiguration())
+                        downloader = DownloadBuilder.New()
+      .WithUrl(words[0])
+      .WithDirectory(path)
+      .WithFileName(item_.Name + ".zip")
+      .WithConfiguration(new DownloadConfiguration())
+
+      .Build();
+
 
-           .Build();
 
-                        
-                        
 
                         if (Progress_Bar != null)
                         {
@@ -2616,7 +2615,7 @@ await Task.Run(() =>
                         downloader.DownloadFileCompleted += delegate (object sender4, AsyncCompletedEventArgs e4)
                         {
 
-                            downloader_DownloadCompleted(sender4, e4, Progress_Bar, item_.Name, item_.Namespace, Destinfo.FullName + @"NS_Downloaded_Mods\" + item_.Name+ ".zip", Plugin_Install, NS_CANDIDATE_INSTALL);
+                            downloader_DownloadCompleted(sender4, e4, Progress_Bar, item_.Name, item_.Namespace, Destinfo.FullName + @"NS_Downloaded_Mods\" + item_.Name + ".zip", Plugin_Install, NS_CANDIDATE_INSTALL);
                         };
                         downloader.StartAsync();
                         if (cancellationToken.IsCancellationRequested)
@@ -2657,7 +2656,7 @@ public void DispatchIfNecessary(Action action)
         }
         public class L_INFO
         {
-           public string name;
+            public string name;
             public string url;
 
         }
@@ -2695,22 +2694,22 @@ void Dependency_Download(string Dependencies_To_Find_And_Download, ProgressBar P
                     string namespace_ = y.name.Split("-")[0];
 
                     var item = new DownloadQueueItem
-                        {
-                            Name = y.name,
-                            DownloadUrl = y.url,
-                            DestinationPath = User_Settings_Vars.NorthstarInstallLocation + @"NS_Downloaded_Mods",
-                            Extract = false,
-                            IsNorthstarRelease = false,
-                            Progress = Progress_Bar,
-                            Namespace = namespace_
+                    {
+                        Name = y.name,
+                        DownloadUrl = y.url,
+                        DestinationPath = User_Settings_Vars.NorthstarInstallLocation + @"NS_Downloaded_Mods",
+                        Extract = false,
+                        IsNorthstarRelease = false,
+                        Progress = Progress_Bar,
+                        Namespace = namespace_
+
+                    };
+                    Main._downloadQueue.Enqueue(item);
+                    //  await Download_Zip_To_Path(y, User_Settings_Vars.NorthstarInstallLocation + @"NS_Downloaded_Mods", Progress_Bar);
+                }
+
 
-                        };
-                         Main._downloadQueue.Enqueue(item);
-                      //  await Download_Zip_To_Path(y, User_Settings_Vars.NorthstarInstallLocation + @"NS_Downloaded_Mods", Progress_Bar);
-                    }
 
-         
-               
 
 
 
@@ -3035,10 +3034,11 @@ async Task Call_Mods_From_Folder_Lite()
 
 
                                 Main.Current_Installed_Mods.Add(new GENERAL_MOD { Name = name, Version = ver, Author = author });
-                                GC.Collect();
 
                             }
                             Main.loaded_mods = true;
+                            GC.Collect();
+
                         }
 
 
@@ -3073,7 +3073,7 @@ public void SlowBlink(Control control, double minimumOpacity)
                 control.BeginAnimation(UIElement.OpacityProperty, animation);
             });
         }
-     
+
         void Update_ActionCard_Progress(Action_Card Action_Card_, int Add_INT = 10, bool Completed = false, bool FailedEvent = false)
         {
             try
@@ -3203,7 +3203,7 @@ public static string FindFirstFile(string path, string searchPattern)
             // simply return string.Empty.
             return string.Empty;
         }
-        public static string FindFolder( string folderName, string searchPattern)
+        public static string FindFolder(string folderName, string searchPattern)
         {
             string[] folders = null;
 
@@ -3247,8 +3247,8 @@ async Task _garbage_holderAsync(string Target_Zip, string Destination)
 
 
         }
-       
-        public async Task Unpack_To_Location_Custom(string Target_Zip, string Destination, ProgressBar Progress_Bar, bool Clean_Thunderstore = false, bool clean_normal = false, bool plugin_install = false, bool NS_CANDIDATE_INSTALL = false, string mod_name = "~",string namespace_ = "~")
+
+        public async Task Unpack_To_Location_Custom(string Target_Zip, string Destination, ProgressBar Progress_Bar, bool Clean_Thunderstore = false, bool clean_normal = false, bool plugin_install = false, bool NS_CANDIDATE_INSTALL = false, string mod_name = "~", string namespace_ = "~")
         {
             //add drag and drop
             var Action_Card_ = Action_Center.FirstOrDefault(i =>
@@ -3322,7 +3322,7 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                     return;
                 }
                 Update_ActionCard_Progress(Action_Card_);
-                
+
                 //checkling for plugins
                 bool containsFolder = CheckIfFolderExistsInZip(Target_Zip, "plugins");
 
@@ -3330,19 +3330,19 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                 if (containsFolder)
                 {
 
-                    
+
 
                     Console.WriteLine("Plugin Detected ------\n\n\n\n\n");
 
                     bool consent_TM = false;
-                   
+
                     DispatchIfNecessary(async () =>
                         {
                             Wpf.Ui.Controls.MessageBox Mesagebox = new Wpf.Ui.Controls.MessageBox();
 
                             Mesagebox.Title = VTOL.Resources.Languages.Language.PLUGINDETECTED;
 
-                            Mesagebox.Content = VTOL.Resources.Languages.Language.PleaseChooseToInstallThisPluginOntoYourDevice+"\n"+VTOL.Resources.Languages.Language.DoBeWarnedThatPluginsCanAffectYourDeviceIn+"\n"+ VTOL.Resources.Languages.Language.UnintendedWays+"\n"+VTOL.Resources.Languages.Language.PleaseEnusreYouTrustThisMod;
+                            Mesagebox.Content = VTOL.Resources.Languages.Language.PleaseChooseToInstallThisPluginOntoYourDevice + "\n" + VTOL.Resources.Languages.Language.DoBeWarnedThatPluginsCanAffectYourDeviceIn + "\n" + VTOL.Resources.Languages.Language.UnintendedWays + "\n" + VTOL.Resources.Languages.Language.PleaseEnusreYouTrustThisMod;
                             Mesagebox.ButtonLeftName = "Install";
                             Mesagebox.ButtonRightName = "Delete";
                             Mesagebox.ButtonLeftAppearance = Wpf.Ui.Common.ControlAppearance.Success;
@@ -3363,12 +3363,12 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                                     {
                                         Progress_Bar.Value = 0;
                                     }
-                                    Update_ActionCard_Progress(Action_Card_, 40, false,true);
+                                    Update_ActionCard_Progress(Action_Card_, 40, false, true);
 
                                     SnackBar.Title = VTOL.Resources.Languages.Language.ERROR;
                                     SnackBar.Timeout = 10000;
                                     SnackBar.Appearance = Wpf.Ui.Common.ControlAppearance.Danger;
-                                    SnackBar.Message =VTOL.Resources.Languages.Language.ThePlugin + Path.GetFileNameWithoutExtension(Target_Zip).Replace("_", " ") + VTOL.Resources.Languages.Language.HasNotBeenInstalledOnYourDevice;
+                                    SnackBar.Message = VTOL.Resources.Languages.Language.ThePlugin + Path.GetFileNameWithoutExtension(Target_Zip).Replace("_", " ") + VTOL.Resources.Languages.Language.HasNotBeenInstalledOnYourDevice;
                                     SnackBar.Show();
                                     return;
 
@@ -3383,11 +3383,11 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                             Mesagebox.ButtonLeftClick += delegate (object sender, System.Windows.RoutedEventArgs e)
                             {
                                 consent_TM = true;
-                                 TryUnzipFile(Target_Zip, Destination);
+                                TryUnzipFile(Target_Zip, Destination);
 
                                 Update_ActionCard_Progress(Action_Card_);
 
-                                 Call_Mods_From_Folder_Lite();
+                                Call_Mods_From_Folder_Lite();
                                 var Destinfo1 = new DirectoryInfo(Destination);
                                 Destinfo1.Attributes &= ~FileAttributes.ReadOnly;
                                 string manifest_json = FindFirstFile(Destinfo1.FullName, "manifest.json");
@@ -3399,7 +3399,7 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
 
                                     if (manidata.SelectToken("namespace") == null)
                                     {
-                                      
+
                                         manidata["namespace"] = namespace_;
 
 
@@ -3420,7 +3420,7 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                                 SnackBar.Title = VTOL.Resources.Languages.Language.SUCCESS;
                                 SnackBar.Timeout = 10000;
                                 SnackBar.Appearance = Wpf.Ui.Common.ControlAppearance.Success;
-                                SnackBar.Message =VTOL.Resources.Languages.Language.ThePlugin + Path.GetFileNameWithoutExtension(Target_Zip).Replace("_", " ") + VTOL.Resources.Languages.Language.Page_Thunderstore_Unpack_To_Location_Custom_HasBeenDownloadedAndInstalled;
+                                SnackBar.Message = VTOL.Resources.Languages.Language.ThePlugin + Path.GetFileNameWithoutExtension(Target_Zip).Replace("_", " ") + VTOL.Resources.Languages.Language.Page_Thunderstore_Unpack_To_Location_Custom_HasBeenDownloadedAndInstalled;
                                 SnackBar.Show();
 
                                 Mesagebox.Close();
@@ -3439,7 +3439,7 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                                 {
                                     Progress_Bar.Value = 0;
                                 }
-                                Update_ActionCard_Progress(Action_Card_, 40, false,true);
+                                Update_ActionCard_Progress(Action_Card_, 40, false, true);
 
                                 SnackBar.Title = VTOL.Resources.Languages.Language.CAUTION;
                                 SnackBar.Timeout = 10000;
@@ -3453,7 +3453,7 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                             };
 
 
-                             Mesagebox.Show();
+                            Mesagebox.Show();
                             if (Progress_Bar != null)
                             {
                                 Progress_Bar.Value = 0;
@@ -3465,7 +3465,7 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                 }
                 else
                 {
-                  
+
                     await TryUnzipFile(Target_Zip, Destination);
 
                     Update_ActionCard_Progress(Action_Card_);
@@ -3553,7 +3553,7 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                                     Progress_Bar.Value = 0;
                                 }
                                 Update_ActionCard_Progress(Action_Card_, 40, true);
-                                
+
 
                                 SnackBar.Title = VTOL.Resources.Languages.Language.SUCCESS;
                                 SnackBar.Appearance = Wpf.Ui.Common.ControlAppearance.Success;
@@ -3570,7 +3570,7 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                     }
                     else
                     {
-                        
+
                         Console.WriteLine("Candidate Detected ------\n\n\n\n\n");
 
                         DispatchIfNecessary(async () =>
@@ -3616,7 +3616,7 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
 
                             }
 
-                            await Task.Delay(100) ;
+                            await Task.Delay(100);
 
 
                             if (File.Exists(User_Settings_Vars.NorthstarInstallLocation + @"ns_startup_args_dedi.txt"))
@@ -3859,8 +3859,8 @@ private string Find_Folder(string searchQuery, string folderPath)
 
             return null; // Return null if no matching folder is found
         }
-       
-      
+
+
 
         public class DownloadQueueItem
         {
@@ -3969,7 +3969,7 @@ private async Task DownloadZipAsync(DownloadQueueItem item, CancellationToken ca
                         URl = parts[0];
 
                     }
-                    
+
                     Main.DispatchIfNecessary(() =>
                     {
                         Main.Action_Center.ItemsSource = null;
@@ -3989,7 +3989,7 @@ private async Task DownloadZipAsync(DownloadQueueItem item, CancellationToken ca
                         Main.Action_Center.ItemsSource = _myClass.Action_Center;
                         Main.Action_Center.Refresh();
                     });
-                    await Task.Run(() => _myClass.Download_Zip_To_Path(item.DownloadUrl, item.DestinationPath, item.Progress, item.Extract, item.IsNorthstarRelease, cancellationToken,item));
+                    await Task.Run(() => _myClass.Download_Zip_To_Path(item.DownloadUrl, item.DestinationPath, item.Progress, item.Extract, item.IsNorthstarRelease, cancellationToken, item));
                     Thread.Sleep(200);
 
                 }
@@ -4035,7 +4035,7 @@ public void CancelDownload(string name, bool clear_all = false)
                                 return i.Name.ToLower().Contains(name.ToLower());
 
 
-                            }); 
+                            });
                             _queue_List_Clear.RemoveAll(i =>
                             {
 
@@ -4055,7 +4055,7 @@ public void CancelDownload(string name, bool clear_all = false)
                         return i.Name.ToLower().Contains(name.ToLower());
 
 
-                });//todo fix clear
+                    });//todo fix clear
 
                     if (item != null)
                     {
@@ -4132,13 +4132,13 @@ private void Install_Bttn_Thunderstore_Click(object sender, RoutedEventArgs e)
                 {
                     name = parts[1]; // get the second last item
                 }
-                 Console.WriteLine(Button.Tag.ToString());
+                Console.WriteLine(Button.Tag.ToString());
 
                 DispatchIfNecessary(async () =>
                 {
                     if (parts[0].Contains("http") || parts[0].Contains("https"))
                     {
-                        string namespace_ =name.Split("-")[0];
+                        string namespace_ = name.Split("-")[0];
 
                         var item = new DownloadQueueItem
                         {
@@ -4192,9 +4192,9 @@ private void TextInput_OnKeyUpDone(object sender, ElapsedEventArgs e)
                     {
                         if (init == true)
                         {
-                            if (Search_Bar_Suggest_Mods.Text.Trim() != "" && Search_Bar_Suggest_Mods.Text != null && Search_Bar_Suggest_Mods.Text.Trim() != "#" )
+                            if (Search_Bar_Suggest_Mods.Text.Trim() != "" && Search_Bar_Suggest_Mods.Text != null && Search_Bar_Suggest_Mods.Text.Trim() != "#")
                             {
-                               
+
 
 
                                 if (_updater.Thunderstore != null)
@@ -4252,56 +4252,43 @@ private void Search_Bar_Suggest_Mods_TextChanged(object sender, TextChangedEvent
 
                 DispatchIfNecessary(async () =>
                 {
-                    if (init == true) 
+                    if (init == true)
 
                     {
 
                         if (_updater.Thunderstore != null)
                         {
-                            if (Search_Bar_Suggest_Mods.Text.Trim() != "" && Search_Bar_Suggest_Mods.Text != null && Search_Bar_Suggest_Mods.Text.Length != 0 && Search_Bar_Suggest_Mods.Text.Trim() != "#")
+                            if (_updater.Thunderstore.Count() > 0)
                             {
-                                if (_updater.Thunderstore.Count() > 0)
+                                DispatchIfNecessary(async () =>
+                                {
+                                    Thunderstore_List.Items.Clear();
+                                });
+                                if (Search_Bar_Suggest_Mods.Text.Trim() != "" && Search_Bar_Suggest_Mods.Text != null && Search_Bar_Suggest_Mods.Text.Length != 0 && Search_Bar_Suggest_Mods.Text.Trim() != "#")
                                 {
-                                    DispatchIfNecessary(async () =>
-                                    {
-                                        Thunderstore_List.Items.Clear();
 
-                                        loadConvertItemLazy(Search_: true, SearchQuery: Search_Bar_Suggest_Mods.Text);
+                                    loadConvertItemLazy(Search_: true, SearchQuery: Search_Bar_Suggest_Mods.Text);
 
-                                    });
                                 }
-                            }
-                            else
-                            {
-                                if (_updater.Thunderstore.Count() > 0)
+                                else
                                 {
-                                    DispatchIfNecessary(async () =>
-                                    {
-                                        Thunderstore_List.Items.Clear();
+                                    loadConvertItemLazy();
 
-                                        loadConvertItemLazy();
 
-                                    });
                                 }
-
                             }
-                            }
-
 
+                        }
 
+                    }
 
 
 
 
-                        }
-                       
 
 
 
 
-                    
-
-
                 });
 
 
@@ -4316,7 +4303,7 @@ private void Search_Bar_Suggest_Mods_TextChanged(object sender, TextChangedEvent
         private void Grid_Unloaded(object sender, RoutedEventArgs e)
         {
             TryDeleteDirectory(User_Settings_Vars.NorthstarInstallLocation + @"NS_Downloaded_Mods");
-          
+
         }
 
         private void Dialog_ButtonLeftClick(object sender, RoutedEventArgs e)
@@ -4525,7 +4512,7 @@ private void Sort_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             try
             {
-                if (Sort.SelectedItem != null )
+                if (Sort.SelectedItem != null)
                 {
                     Sort_Label.Visibility = Visibility.Hidden;
                 }
@@ -4543,19 +4530,19 @@ private void Sort_SelectionChanged(object sender, SelectionChangedEventArgs e)
                     //{
 
 
-                        //Call_Ts_Mods();
+                    //Call_Ts_Mods();
 
-                        if (_updater.Thunderstore != null)
+                    if (_updater.Thunderstore != null)
+                    {
+                        if (_updater.Thunderstore.Count() > 0)
                         {
-                            if (_updater.Thunderstore.Count() > 0)
+                            DispatchIfNecessary(async () =>
                             {
-                                DispatchIfNecessary(async () =>
-                                {
 
-                                    orderlistitems();
-                                });
-                            }
+                                orderlistitems();
+                            });
                         }
+                    }
 
 
                     //};
@@ -4601,40 +4588,41 @@ private void Grid_Loaded(object sender, RoutedEventArgs e)
             {
 
 
-                if (page_loaded == true)
-                {
-                    BackgroundWorker worker = new BackgroundWorker();
-                    worker.DoWork += (sender, e) =>
-                    {
+                //if (page_loaded == true)
+                //{
+                //    BackgroundWorker worker = new BackgroundWorker();
+                //    worker.DoWork += (sender, e) =>
+                //    {
 
 
-                        Call_Mods_From_Folder_Lite();
-                        if (Main.Page_reset_ == true)
-                        {
-                            
-                          //  Call_Ts_Mods();
+                //        Call_Mods_From_Folder_Lite();
+                //        if (Main.Page_reset_ == true)
+                //        {
 
+                //          //  Call_Ts_Mods();
 
 
-                        }
 
+                //        }
 
 
 
 
-                    };
-                    worker.RunWorkerCompleted += (sender, eventArgs) =>
-                    {
-                        Main.Page_reset_ = false;
-                      //  Thunderstore_List.Items.Refresh();
 
+                //    };
+                //    worker.RunWorkerCompleted += (sender, eventArgs) =>
+                //    {
+                //        Main.Page_reset_ = false;
+                //      //  Thunderstore_List.Items.Refresh();
 
-                    };
 
+                //    };
 
 
-                    worker.RunWorkerAsync();
-                }
+
+                //    worker.RunWorkerAsync();
+                //}
+            
             }
             catch (Exception ex)
             {
diff --git a/VTOL_2.0.0/VTOL.csproj b/VTOL_2.0.0/VTOL.csproj
index 1df581b..dd00ff8 100644
--- a/VTOL_2.0.0/VTOL.csproj
+++ b/VTOL_2.0.0/VTOL.csproj
@@ -22,7 +22,7 @@
 	  <PackageTags>mod;installer;modmanager;northstar-client;titanfall2</PackageTags>
 	  <AssemblyVersion>3.0.4</AssemblyVersion>
 	  <FileVersion>3.0.4</FileVersion>
-	  <Version>3.0.3</Version>
+	  <Version>3.0.4</Version>
 	  <EnableNETAnalyzers>False</EnableNETAnalyzers>
 	  <ErrorReport>none</ErrorReport>
 	  <Title>VTOL</Title>