diff --git a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin
new file mode 100644
index 00000000..8231f22c
Binary files /dev/null and b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.metadata.v7.bin differ
diff --git a/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin
new file mode 100644
index 00000000..11ff1173
Binary files /dev/null and b/VTOL_2.0.0/.vs/ProjectEvaluation/vtol.projects.v7.bin differ
diff --git a/VTOL_2.0.0/.vs/VTOL/DesignTimeBuild/.dtbcache.v2 b/VTOL_2.0.0/.vs/VTOL/DesignTimeBuild/.dtbcache.v2
index 52c0f050..8ca1e99b 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/b484dd4a-c9f9-48d1-a490-80ec66328afe.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/b484dd4a-c9f9-48d1-a490-80ec66328afe.vsidx
new file mode 100644
index 00000000..4b37faf4
Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/b484dd4a-c9f9-48d1-a490-80ec66328afe.vsidx differ
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/be976e46-338a-48da-bb12-501e6943583a.vsidx b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/be976e46-338a-48da-bb12-501e6943583a.vsidx
new file mode 100644
index 00000000..161676dd
Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/be976e46-338a-48da-bb12-501e6943583a.vsidx differ
diff --git a/VTOL_2.0.0/.vs/VTOL/FileContentIndex/read.lock b/VTOL_2.0.0/.vs/VTOL/FileContentIndex/read.lock
new file mode 100644
index 00000000..e69de29b
diff --git a/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v1 b/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v1
index 359474c8..e35475ef 100644
Binary files a/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v1 and b/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v1 differ
diff --git a/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v2 b/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v2
new file mode 100644
index 00000000..7133f85c
Binary files /dev/null and b/VTOL_2.0.0/.vs/VTOL/v17/.futdcache.v2 differ
diff --git a/VTOL_2.0.0/.vs/VTOL/v17/fileList.bin b/VTOL_2.0.0/.vs/VTOL/v17/fileList.bin
index 77bd65f1..fb76cb2d 100644
Binary files a/VTOL_2.0.0/.vs/VTOL/v17/fileList.bin and b/VTOL_2.0.0/.vs/VTOL/v17/fileList.bin differ
diff --git a/VTOL_2.0.0/MainWindow.xaml b/VTOL_2.0.0/MainWindow.xaml
index 9566add2..5ebd1024 100644
--- a/VTOL_2.0.0/MainWindow.xaml
+++ b/VTOL_2.0.0/MainWindow.xaml
@@ -173,9 +173,10 @@
             <Grid>
                 <Border
                 x:Name="mask"
-                Background="#FF171717"
+                 Background="{ui:ThemeResource}" 
                 CornerRadius="8"
             />
+                <!--="#FF171717"-->
 
                 <!--<ui:Breadcrumb
                     Margin="10,10,0,0"
@@ -281,7 +282,7 @@
             Grid.Column="0"
             Margin="6,40,6,0"
             Frame="{Binding ElementName=RootFrame}"
-            SelectedPageIndex="0" Navigated="RootNavigation_Navigated" Precache="False" TransitionDuration="420" Orientation="Vertical" LostFocus="RootNavigation_LostFocus" AllowDrop="False" TransitionType="FadeIn" PreviewMouseDown="RootNavigation_PreviewMouseDown" TargetUpdated="RootNavigation_TargetUpdated" SourceUpdated="RootNavigation_SourceUpdated" 
+            SelectedPageIndex="0" Navigated="RootNavigation_Navigated" Precache="False" TransitionDuration="420" Orientation="Vertical" LostFocus="RootNavigation_LostFocus" AllowDrop="False" TransitionType="FadeIn" PreviewMouseDown="RootNavigation_PreviewMouseDown" TargetUpdated="RootNavigation_TargetUpdated" SourceUpdated="RootNavigation_SourceUpdated" Foreground="#FFF10000" 
           >
             <ui:NavigationCompact.Items>
                 <ui:NavigationItem x:Name="Home"
diff --git a/VTOL_2.0.0/MainWindow.xaml.cs b/VTOL_2.0.0/MainWindow.xaml.cs
index 5805c7e4..d5cb13a7 100644
--- a/VTOL_2.0.0/MainWindow.xaml.cs
+++ b/VTOL_2.0.0/MainWindow.xaml.cs
@@ -108,13 +108,22 @@ public string ProductVersion
 
             }
         }
+        private void UserInterfaceCustomScale(double customScale)
+        {
+            // Change scale of window content
+        
+            ScaleTransform dpiTransform = new ScaleTransform(1.5,1.5);
       
+            this.LayoutTransform = dpiTransform;
+       
+        }
         public MainWindow()
         {
             InitializeComponent();
 
             try
             {
+               
                 NotificationManager =  new NotificationManager();
                 minimize_to_tray =  Properties.Settings.Default.Minimize_to_Tray;
                 Profile_TAG.Content = Properties.Settings.Default.Profile_Name;
@@ -299,7 +308,8 @@ public MainWindow()
                     Admin_Label.Visibility = Visibility.Hidden;
 
                 }
-
+                //double dpiFactor = System.Windows.PresentationSource.FromVisual(this).CompositionTarget.TransformToDevice.M11;
+                UserInterfaceCustomScale(1.5);
 
             }
 
diff --git a/VTOL_2.0.0/Pages/Page_Mods.xaml b/VTOL_2.0.0/Pages/Page_Mods.xaml
index db412ec1..f2c90bde 100644
--- a/VTOL_2.0.0/Pages/Page_Mods.xaml
+++ b/VTOL_2.0.0/Pages/Page_Mods.xaml
@@ -16,6 +16,8 @@
             <Setter Property="RenderOptions.BitmapScalingMode" Value="HighQuality" />
         </Style>
 
+
+
         <ControlTemplate x:Key="ButtonControlTemplate1" TargetType="{x:Type Button}">
             <Border x:Name="border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True" CornerRadius="20">
                 <ContentPresenter x:Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
@@ -190,19 +192,82 @@
 
 
         </ListBox>
-        
 
-        <ui:Snackbar x:Name="Snack" Grid.ColumnSpan="3" Margin="24,0,24,24"/>
+
         <Label Content="{x:Static properties:Language.Page_Mods_ListedHereAreTheModsThatAreCurrentlyInstalled}" Margin="65,0,0,573" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" UseLayoutRounding="True" Padding="0,0,0,0" Height="16" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="281" Grid.ColumnSpan="2"/>
         <Label Content="{x:Static properties:Language.Page_Mods_MODS}" Margin="65,0,342,594" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" UseLayoutRounding="True" Padding="0,0,0,0" Background="{x:Null}" Foreground="White" FontSize="22" FontWeight="Bold" Height="28" VerticalAlignment="Bottom"/>
         <Label x:Name="Filter_Label" Content="{x:Static properties:Language.Page_Mods_Filter}" Margin="146,99,0,0" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" UseLayoutRounding="False" Padding="0,0,0,0" Grid.Column="1" FontSize="14" MinHeight="19" SnapsToDevicePixels="False" VerticalAlignment="Top" HorizontalAlignment="Left" Width="47"/>
         <Label x:Name="Mod_Count_Label" Content ="Mod Count: 0" Margin="65,605,0,0" Height="16" VerticalAlignment="Top" HorizontalAlignment="Left" Width="495" Padding="0,0,0,0" Foreground="#52FFFFFF" HorizontalContentAlignment="Left" VerticalContentAlignment="Center"/>
         <Label Content ="{x:Static properties:Language.Page_Mods_RightClickForContextMenu}" Margin="0,605,5,0" Height="16" VerticalAlignment="Top" HorizontalAlignment="Right" Width="368" Padding="0,0,0,0" Grid.Column="1" HorizontalContentAlignment="Right" Foreground="#52FFFFFF" VerticalContentAlignment="Center"/>
-
+        <Border x:Name="Options_Panel_Mod" Background="#B2292929" Visibility="Collapsed" Grid.ColumnSpan="3">
+            <Grid>
+                <Border x:Name="MOD_INFO_PANEL" Visibility="Visible" Background="#FF191919" CornerRadius="7,7,7,7" HorizontalAlignment="Center" Width="560" Height="510" VerticalAlignment="Center">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="279*"/>
+                            <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <ui:Button  x:Name="Exit_BTN_ADD_Prfl" Icon="Dismiss24" Height="26" Margin="523,10,0,0" VerticalAlignment="Top"  BorderBrush="{x:Null}"  Padding="0,0,0,0" ToolTip="Exit" Background="#FF7B0000"  ClickMode="Press" Width="25" Click="EXIT" RenderTransformOrigin="0.5,0.5" >
+                            <ui:Button.RenderTransform>
+                                <TransformGroup>
+                                    <ScaleTransform ScaleX="1.2" ScaleY="1.2"/>
+                                    <SkewTransform/>
+                                    <RotateTransform/>
+                                    <TranslateTransform/>
+                                </TransformGroup>
+                            </ui:Button.RenderTransform>
+                        </ui:Button>
+                        <Border Margin="48,159,45,211" CornerRadius="3" Background="#FF252525">
+                            <TextBlock 
+         TextWrapping="Wrap"  x:Name="Description_Box"   Foreground="White" Padding="5,5,5,0" FontSize="13" IsManipulationEnabled="True"/>
+
+
+                        </Border>
+
+
+                        <TreeView x:Name="Dependency_Tree" Margin="48,336,45,65" Background="#FF252525" FontSize="13" Padding="-2,0,0,0">
+
+                        </TreeView>
+                        <Label Content="{x:Static properties:Language.MODINFO}" Margin="0,13,0,0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" UseLayoutRounding="True" Padding="0,0,0,0" Background="{x:Null}" Foreground="White" FontSize="16" FontWeight="Bold" Height="23" VerticalAlignment="Top" HorizontalAlignment="Center" Width="240"/>
+
+                        <Label  x:Name="INFO_VERSION_SET"  Content="v1.1.2" Margin="284,0,0,404" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Right" UseLayoutRounding="True" Padding="0,0,0,0" Height="23" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="229" FontSize="14"/>
+                        <Label  x:Name="INFO_VERSION_MOD_SET"  Content="84" Margin="284,0,0,382" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Right" UseLayoutRounding="True" Padding="0,0,0,0" Height="22" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="229" FontSize="14"/>
+                        <Label x:Name="INFO_MOD_SIZE_SET" Content="5GB" Margin="284,0,0,362" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Right" UseLayoutRounding="True" Padding="0,0,0,0" Height="20" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="229" FontSize="14"/>
+                        <Label Content="{x:Static properties:Language.PATH}" Margin="48,0,0,404" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" UseLayoutRounding="True" Padding="0,0,0,0" Height="23" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="231" FontSize="14"/>
+                        <Label  Content="{x:Static properties:Language.VERSION}" Margin="48,0,0,382" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" UseLayoutRounding="True" Padding="0,0,0,0" Height="22" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="231" FontSize="14"/>
+                        <Label x:Name="INFO_MODSIZE_SET"  Content="{x:Static properties:Language.MODSIZEONDISK}" Margin="48,0,0,362" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" UseLayoutRounding="True" Padding="0,0,0,0" Height="20" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="231" FontSize="14"/>
+                        <Separator HorizontalAlignment="Center" VerticalAlignment="Top" Height="118" Background="#4CFFFFFF" BorderBrush="#4CFFFFFF" Margin="0,30,0,0" Foreground="{x:Null}" MinHeight="45" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Padding="0,0,1,0" RenderTransformOrigin="0.5,0.5" Width="4">
+                            <Separator.RenderTransform>
+                                <TransformGroup>
+                                    <ScaleTransform ScaleX="-0.55"/>
+                                    <SkewTransform/>
+                                    <RotateTransform/>
+                                    <TranslateTransform/>
+                                </TransformGroup>
+                            </Separator.RenderTransform>
+                        </Separator>
+                        <Label   x:Name="INFO_NAME_SET"   Content="NAME" Margin="48,0,0,427" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" UseLayoutRounding="True" Padding="0,0,0,0" Height="23" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="237" FontSize="14"/>
+                        <Label x:Name="NAME"  Content="MODNAME" Margin="284,0,0,427" VerticalContentAlignment="Stretch" UseLayoutRounding="True" Padding="0,0,0,0" Height="23" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="229" HorizontalContentAlignment="Right" FontSize="14"/>
+
+
+                        <Label  Content="DESCRIPTION" Margin="48,0,0,194" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" UseLayoutRounding="True" Padding="0,0,0,0" Height="16" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="231"/>
+                        <Label  Content="DEPENDENCY TREE" Margin="48,0,0,47" VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" UseLayoutRounding="True" Padding="0,0,0,0" Height="16" VerticalAlignment="Bottom" HorizontalAlignment="Left" Width="231"/>
+
+                    </Grid>
+                </Border>
+            </Grid>
+        </Border>
         <ui:Dialog x:Name="DialogF" Grid.ColumnSpan="3" Grid.RowSpan="3" DialogHeight="250" Foreground="White" FontStretch="SemiCondensed" FontFamily="Segoe UI Semibold" ButtonRightClick="DialogF_ButtonRightClick" ButtonLeftClick="DialogF_ButtonLeftClick" Drop="Mod_List_Box_Drop" PreviewDragEnter="Mod_List_Box_PreviewDragEnter" PreviewDragLeave="Mod_List_Box_PreviewDragLeave" AllowDrop="True" Visibility="Visible"/>
 
         <ui:Dialog x:Name="Dialog" Grid.ColumnSpan="3" Grid.RowSpan="3" DialogHeight="250" Foreground="White" FontStretch="SemiCondensed" FontFamily="Segoe UI Semibold" ButtonRightClick="Dialog_ButtonRightClick" Visibility="Visible">
         </ui:Dialog>
+
+
+
+
+
+
+
         <Border x:Name="Drag_Drop_Overlay_Mods" Grid.ColumnSpan="3" Background="#99000000" Visibility="Hidden" HorizontalAlignment="Right" Width="1148" Drop="Mod_List_Box_Drop" PreviewDragOver="Drag_Drop_Overlay_Mods_PreviewDragOver" AllowDrop="True">
             <ui:SymbolIcon  Height="18" Width="16" Symbol="ArrowDownload48" RenderTransformOrigin="0.5,0.5" >
                 <ui:SymbolIcon.RenderTransform>
@@ -216,5 +281,8 @@
             </ui:SymbolIcon>
 
         </Border>
+
+        <ui:Snackbar x:Name="Snack" Grid.ColumnSpan="3" Margin="24,0,24,24"/>
+
     </Grid>
 </Page>
diff --git a/VTOL_2.0.0/Pages/Page_Mods.xaml.cs b/VTOL_2.0.0/Pages/Page_Mods.xaml.cs
index 314ccd8b..b2b7fda3 100644
--- a/VTOL_2.0.0/Pages/Page_Mods.xaml.cs
+++ b/VTOL_2.0.0/Pages/Page_Mods.xaml.cs
@@ -28,6 +28,9 @@
 using Wpf.Ui.Common.Interfaces;
 using Path = System.IO.Path;
 using VTOL;
+using System.Xml.Linq;
+using ABI.Windows.UI;
+using HandyControl.Tools.Extension;
 
 namespace VTOL.Pages
 {
@@ -1944,9 +1947,14 @@ void Open_Mod_Info(string Mod_name)
 
                 if (Directory.Exists(FolderDir))
                 {
+                    Dependency_Tree.Items.Clear();
+
+                    List<string> Dependencies = new List<string> { };
+                    string Dependencies_String = "";
 
 
                     string mod_Json = FindFirstFile(FolderDir, "mod.json");
+                    string manifest_json = FindFirstFile(FolderDir, "manifest.json");
 
 
                     if (mod_Json != null && File.Exists(mod_Json))
@@ -1958,19 +1966,62 @@ void Open_Mod_Info(string Mod_name)
                         string Description = "Description: " + myJObject.Description;
                         long size = GetDirectorySize(FolderDir);
                         string size_str = "Mod Size on Disk: " + SizeSuffix(size);
+                        string Content = Description + Environment.NewLine + version + Environment.NewLine + size_str.Replace(",", ".");
+                        NAME.Content = myJObject.Name;
+                        INFO_MOD_SIZE_SET.Content = SizeSuffix(size);
+                        string cleaned = FolderDir.ToString().Substring(FolderDir.ToString().LastIndexOf("Titanfall2"));
+                        cleaned = cleaned.ToString().Substring(0, cleaned.ToString().LastIndexOf("mods") + 4);
+                        INFO_VERSION_MOD_SET.Content = cleaned;
+                        INFO_VERSION_SET.Content = myJObject.Version;
+                        Description_Box.Text = myJObject.Description;
+                        if (manifest_json != null && File.Exists(manifest_json))
+                        {
+                            var mymanifestString = File.ReadAllText(manifest_json);
+                            dynamic myMObject = JObject.Parse(mymanifestString);
+
+                            for (var x = 0;  x < myMObject.dependencies.Count; x++)
+                            {
+                                if (myMObject.dependencies[x].ToString().Contains("northstar-Northstar") || myMObject.dependencies[x].ToString().Contains("ebkr-r2modman-"))
+                                {
+
+                                    continue;
+                                }
+                                else
+                                {
+                                    
+                                    Dependency_Tree.Items.Add(VTOL.Resources.Languages.Language.Requires + myMObject.dependencies[x].ToString());
+                                    
+                                }
+
+                            }
+
+                            
+
+
+                        }
+                        else
+                        {
+
+                            Snackbar.Title = "WARNING";
+                            Snackbar.Message = "The manifest File Cannot Be accessed or Found!";
+                            Snackbar.Appearance = Wpf.Ui.Common.ControlAppearance.Info;
+                            Snackbar.Show();
+                        }
 
-                       
-                        string Content = Description + Environment.NewLine + version + Environment.NewLine + size_str.Replace(",",".");
-                        DialogF.ButtonLeftName = "Ok";
-                        DialogF.ButtonLeftAppearance = Wpf.Ui.Common.ControlAppearance.Success;
-                        DialogF.ButtonRightName = VTOL.Resources.Languages.Language.Page_Mods_Open_Mod_Info_OpenFolder;
 
-                        DialogF.ButtonRightAppearance = Wpf.Ui.Common.ControlAppearance.Secondary;
-                        DialogF.Title = name;
-                        DialogF.Message = Content;
-                        DialogF.Tag = FolderDir;
+                        Options_Panel_Mod.Visibility = Visibility.Visible;
 
-                        DialogF.Show();
+
+
+
+                    }
+                    else
+                    {
+
+                        Snackbar.Title = "ERROR";
+                        Snackbar.Appearance = Wpf.Ui.Common.ControlAppearance.Danger;
+                        Snackbar.Message = "The Mod Information File Cannot Be accessed or Found!";
+                        Snackbar.Show();
                     }
 
 
@@ -2719,5 +2770,21 @@ private void CloseButton_Click(object sender, RoutedEventArgs e)
         {
 
         }
+
+        private void Exit_BTN_ADD_Prfl_Click_1(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void EXIT(object sender, RoutedEventArgs e)
+        {
+            Options_Panel_Mod.Visibility = Visibility.Collapsed;
+        }
+
+        private void Options_Panel_Mod_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            Options_Panel_Mod.Visibility = Visibility.Collapsed;
+
+        }
     }
 }
diff --git a/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs b/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs
index 8223d16b..f0d38058 100644
--- a/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs
+++ b/VTOL_2.0.0/Pages/Page_Thunderstore.xaml.cs
@@ -35,6 +35,7 @@
 using System.Timers;
 using Newtonsoft.Json.Linq;
 using System.Text.RegularExpressions;
+using System.Collections.ObjectModel;
 
 namespace VTOL.Pages
 {
@@ -645,6 +646,7 @@ public partial class Page_Thunderstore : Page
         private int Mod_Update_Counter = 0;
         private List<Action_Card> Action_Center = new List<Action_Card>();
         public DownloadQueue _downloadQueue;
+        private ObservableCollection<Grid_> thunderstoreItems = new ObservableCollection<Grid_>();
 
         public Page_Thunderstore()
         {
@@ -717,6 +719,15 @@ public static MainWindow GetMainWindow()
             return mainWindow;
 
         }
+        //public ObservableCollection<Grid_> ThunderstoreItems
+        //{
+        //    //get { return thunderstoreItems; }
+        //    //set
+        //    //{
+        //    //    thunderstoreItems = value;
+        //    //    OnPropertyChanged(nameof(ThunderstoreItems));
+        //    //}
+        //}
         public void CookFaveMods()
         {
             try
@@ -1177,7 +1188,7 @@ public async Task Call_Ts_Mods()
 
                 var NON_UI = new Thread(() =>
                 {
-                    _updater.Download_Cutom_JSON();
+                     _updater.Download_Cutom_JSON();
                     if (_updater.Thunderstore != null)
                     {
                         if (_updater.Thunderstore.Count() > 0)
@@ -1836,7 +1847,6 @@ public void orderlistitems()
 
 
             }
-            Thunderstore_List.Items.Clear();
 
             foreach (var TS_MOD in List)
                 {
@@ -1849,8 +1859,6 @@ public void orderlistitems()
 
                 }
         }
-
-       
         private Grid_ LoadListViewItem(Thunderstore_V1 updater, bool Search_ = false, string SearchQuery = "#")
         {
             Grid_ Card = new Grid_();
@@ -2060,7 +2068,7 @@ private Grid_ LoadListViewItem(Thunderstore_V1 updater, bool Search_ = false, st
                     }
                 }
             }
-            
+
 
             else
             {
@@ -2223,7 +2231,7 @@ private Grid_ LoadListViewItem(Thunderstore_V1 updater, bool Search_ = false, st
                     return Card = (new Grid_ { Name = updater.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 + "|" + updater.Name + "-" + versions.First().VersionNumber + "|" + Tags + "|" + Dependencies_, Webpage = updater.PackageUrl, File_Size = FileSize, Tag = Tags, Downloads = downloads, Dependencies = Dependencies_, FullName = updater.FullName, raw_size = raw_size, Update_data = updater.Name + "|" + versions.First().VersionNumber, Button_label = label, Button_Color = bg_color, is_Favourite_ = is_favourite });
                 }
             }
-        
+
 
 
 
@@ -2231,25 +2239,486 @@ private Grid_ LoadListViewItem(Thunderstore_V1 updater, bool Search_ = false, st
             return null;
 
 
+
+
+
+
+
+        }
+
+
+        private void AsyncLoadListViewItem(Thunderstore_V1 updater, bool Search_ = false, string SearchQuery = "#")
+        {
+            Grid_ Card = new Grid_();
+            string ICON = "";
+            List<int> Downloads = new List<int> { };
+            List<object> Temp = new List<object> { };
+            List<string> Dependencies = new List<string> { };
+            string Tags = "";
+            string downloads = "";
+            string download_url = "";
+            string Descrtiption = "";
+            string FileSize = "";
+            string Exclude_String = "#";
+            string Dependencies_ = "";
+            string Update_data = "";
+            string Button_label = "";
+
+
+            if (updater.FullName.Contains("r2modman"))
+            {
+                return ;
+            }
+            if (updater.IsDeprecated == true)
+            {
+                return ;
+            }
+            int rating = updater.RatingScore;
+
+            Tags = String.Join(" , ", updater.Categories);
+
+
+            List<versions> versions = updater.versions;
+
+            foreach (var items in versions)
+            {
+
+                Downloads.Add(Convert.ToInt32(items.Downloads));
+
+            }
+            //if (Current_Mod_Filter_Tags == null)
+            //{
+            //    Current_Mod_Filter_Tags = new List<string>();
+            //}
+
+            if (Current_Mod_Filter_Tags != null)
+            {
+
+
+                if (updater.Categories.Select(x => x).Intersect(Current_Mod_Filter_Tags).Any())
+                {
+                    if (Search_ == true)
+                    {
+
+
+
+
+
+                        if (updater.Name.IndexOf(SearchQuery, StringComparison.OrdinalIgnoreCase) == -1 && updater.Owner.IndexOf(SearchQuery, StringComparison.OrdinalIgnoreCase) == -1)
+                        {
+                          
+
+
+                            return ;
+                        }
+
+                        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-"))
+                            {
+
+                                continue;
+                            }
+                            else
+                            {
+                                Dependencies.Add(versions.First().Dependencies[x]);
+
+                            }
+
+                        }
+
+                        Dependencies_ = String.Join(", ", Dependencies);
+
+                        download_url = versions.First().DownloadUrl;
+                        ICON = versions.First().Icon;
+                        FileSize = versions.First().FileSize.ToString();
+                        Descrtiption = versions.First().Description;
+                        Downloads.Clear();
+                        Dependencies.Clear();
+
+
+                        string raw_size = versions.First().FileSize.ToString();
+
+                        if (int.TryParse(FileSize, out int value))
+                        {
+                            FileSize = Convert_To_Size(value);
+                        }
+                        string bg_color;
+                        string label;
+                        Compare_Mod_To_List(updater.Name, versions.First().VersionNumber, Main.Current_Installed_Mods, out bg_color, out label);
+                        if (bg_color == null || label == null)
+                        {
+                            bg_color = "#FF005D42";
+                            label = "Install";
+
+
+
+                        }
+                        if (label == "Update")
+                        {
+                            Mod_Update_Counter++;
+                        }
+                        int is_favourite = 0;
+
+                        if (Fave_Mods.Contains(updater.Name.Replace("_", " ") + "-" + versions.First().VersionNumber))
+                        {
+                            is_favourite = 1;
+                        }
+                        DispatchIfNecessary(async () =>
+                        {
+                            // is_nsfw = updater.HasNsfwContent ? 100 : 0;
+                            if (Card != null)
+                            {
+                                Card = (new Grid_ { Name = updater.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 + "|" + updater.Name + "-" + versions.First().VersionNumber + "|" + Tags + "|" + Dependencies_, Webpage = updater.PackageUrl, File_Size = FileSize, Tag = Tags, Downloads = downloads, Dependencies = Dependencies_, FullName = updater.FullName, raw_size = raw_size, Update_data = updater.Name + "|" + versions.First().VersionNumber, Button_label = label, Button_Color = bg_color, is_Favourite_ = is_favourite });
+
+                                Thunderstore_List.Items.Add(Card);
+
+
+                            }
+                        });
+
+
+
+
+
+
+                    }
+                    else
+                    {
+
+
+
+
+
+
+
+
+                        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-"))
+                            {
+
+                                continue;
+                            }
+                            else
+                            {
+                                Dependencies.Add(versions.First().Dependencies[x]);
+
+                            }
+
+                        }
+
+
+                        download_url = versions.First().DownloadUrl;
+
+                        ICON = versions.First().Icon;
+                        FileSize = versions.First().FileSize.ToString();
+                        Descrtiption = versions.First().Description;
+                        Dependencies_ = String.Join(", ", Dependencies);
+
+                        Dependencies.Clear();
+
+                        Downloads.Clear();
+
+                        string raw_size = versions.First().FileSize.ToString();
+
+                        if (int.TryParse(FileSize, out int value))
+                        {
+                            FileSize = Convert_To_Size(value);
+                        }
+                        string bg_color;
+                        string label;
+                        int is_favourite = 0;
+                        //  int is_nsfw = 0;
+
+                        if (Fave_Mods.Contains(updater.Name.Replace("_", " ") + "-" + versions.First().VersionNumber))
+                        {
+                            is_favourite = 1;
+                        }
+
+
+                        Compare_Mod_To_List(updater.Name, versions.First().VersionNumber, Main.Current_Installed_Mods, out bg_color, out label);
+                        if (bg_color == null || label == null)
+                        {
+                            bg_color = "#FF005D42";
+                            label = "Install";
+
+
+
+                        }
+                        if (label == "Update")
+                        {
+                            Mod_Update_Counter++;
+                        }
+                        //   is_nsfw = updater.HasNsfwContent ? 100 : 0;
+                        DispatchIfNecessary(async () =>
+                        {
+                            // is_nsfw = updater.HasNsfwContent ? 100 : 0;
+                            if (Card != null)
+                            {
+                                Card = (new Grid_ { Name = updater.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 + "|" + updater.Name + "-" + versions.First().VersionNumber + "|" + Tags + "|" + Dependencies_, Webpage = updater.PackageUrl, File_Size = FileSize, Tag = Tags, Downloads = downloads, Dependencies = Dependencies_, FullName = updater.FullName, raw_size = raw_size, Update_data = updater.Name + "|" + versions.First().VersionNumber, Button_label = label, Button_Color = bg_color, is_Favourite_ = is_favourite });
+                                Thunderstore_List.Items.Add(Card);
+
+                            }
+                        });
+                            
+                            }
+                }
+            }
+            
+
+            else
+            {
+
+                if (Search_ == true)
+                {
+
+
+
+
+
+                    if (updater.Name.IndexOf(SearchQuery, StringComparison.OrdinalIgnoreCase) == -1 && updater.Owner.IndexOf(SearchQuery, StringComparison.OrdinalIgnoreCase) == -1)
+                    {
+                        DispatchIfNecessary(async () =>
+                        {
+
+
+                        });
+
+
+                        return ;
+                    }
+
+                    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-"))
+                        {
+
+                            continue;
+                        }
+                        else
+                        {
+                            Dependencies.Add(versions.First().Dependencies[x]);
+
+                        }
+
+                    }
+
+                    Dependencies_ = String.Join(", ", Dependencies);
+
+                    download_url = versions.First().DownloadUrl;
+                    ICON = versions.First().Icon;
+                    FileSize = versions.First().FileSize.ToString();
+                    Descrtiption = versions.First().Description;
+                    Downloads.Clear();
+                    Dependencies.Clear();
+
+
+                    string raw_size = versions.First().FileSize.ToString();
+
+                    if (int.TryParse(FileSize, out int value))
+                    {
+                        FileSize = Convert_To_Size(value);
+                    }
+                    string bg_color;
+                    string label;
+                    Compare_Mod_To_List(updater.Name, versions.First().VersionNumber, Main.Current_Installed_Mods, out bg_color, out label);
+                    if (bg_color == null || label == null)
+                    {
+                        bg_color = "#FF005D42";
+                        label = "Install";
+
+
+
+                    }
+                    if (label == "Update")
+                    {
+                        Mod_Update_Counter++;
+                    }
+                    int is_favourite = 0;
+
+                    if (Fave_Mods.Contains(updater.Name.Replace("_", " ") + "-" + versions.First().VersionNumber))
+                    {
+                        is_favourite = 1;
+                    }
+
+                    // is_nsfw = updater.HasNsfwContent ? 100 : 0;
+                    DispatchIfNecessary(async () =>
+                    {
+                        // is_nsfw = updater.HasNsfwContent ? 100 : 0;
+                        if (Card != null)
+                        {
+                             Card = (new Grid_ { Name = updater.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 + "|" + updater.Name + "-" + versions.First().VersionNumber + "|" + Tags + "|" + Dependencies_, Webpage = updater.PackageUrl, File_Size = FileSize, Tag = Tags, Downloads = downloads, Dependencies = Dependencies_, FullName = updater.FullName, raw_size = raw_size, Update_data = updater.Name + "|" + versions.First().VersionNumber, Button_label = label, Button_Color = bg_color, is_Favourite_ = is_favourite });
+                            Thunderstore_List.Items.Add(Card);
+
+                        }
+                    });
+
+
+
+
+
+                }
+                else
+                {
+
+
+
+
+
+
+
+
+                    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-"))
+                        {
+
+                            continue;
+                        }
+                        else
+                        {
+                            Dependencies.Add(versions.First().Dependencies[x]);
+
+                        }
+
+                    }
+
+
+                    download_url = versions.First().DownloadUrl;
+
+                    ICON = versions.First().Icon;
+                    FileSize = versions.First().FileSize.ToString();
+                    Descrtiption = versions.First().Description;
+                    Dependencies_ = String.Join(", ", Dependencies);
+
+                    Dependencies.Clear();
+
+                    Downloads.Clear();
+
+                    string raw_size = versions.First().FileSize.ToString();
+
+                    if (int.TryParse(FileSize, out int value))
+                    {
+                        FileSize = Convert_To_Size(value);
+                    }
+                    string bg_color;
+                    string label;
+                    int is_favourite = 0;
+                    //  int is_nsfw = 0;
+
+                    if (Fave_Mods.Contains(updater.Name.Replace("_", " ") + "-" + versions.First().VersionNumber))
+                    {
+                        is_favourite = 1;
+                    }
+
+
+                    Compare_Mod_To_List(updater.Name, versions.First().VersionNumber, Main.Current_Installed_Mods, out bg_color, out label);
+                    if (bg_color == null || label == null)
+                    {
+                        bg_color = "#FF005D42";
+                        label = "Install";
+
+
+
+                    }
+                    if (label == "Update")
+                    {
+                        Mod_Update_Counter++;
+                    }
+                    //   is_nsfw = updater.HasNsfwContent ? 100 : 0;
+                    DispatchIfNecessary(async () =>
+                    {
+                        // is_nsfw = updater.HasNsfwContent ? 100 : 0;
+                        if (Card != null)
+                        {
+                             Card = (new Grid_ { Name = updater.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 + "|" + updater.Name + "-" + versions.First().VersionNumber + "|" + Tags + "|" + Dependencies_, Webpage = updater.PackageUrl, File_Size = FileSize, Tag = Tags, Downloads = downloads, Dependencies = Dependencies_, FullName = updater.FullName, raw_size = raw_size, Update_data = updater.Name + "|" + versions.First().VersionNumber, Button_label = label, Button_Color = bg_color, is_Favourite_ = is_favourite });
+                            Thunderstore_List.Items.Add(Card);
+
+                        }
+                    });
+                    }
+            }
+        
+
+
+
+
+            return ;
+
+
     
 
         
 
 
           }
+        void AddLoadingCard()
+        {
+            Grid_ loadingCard = new Grid_
+            {
+                Tag = "Loading",
+                Name = "Loading",
+                FullName = "Loading",
+                Icon = "loading_icon.png",
+                owner = "Loading Owner",
+                description = "Loading Description",
+                download_url = "Loading Download URL",
+                Webpage = "Loading Webpage",
+                date_created = "Loading Date Created",
+                Rating = 0,
+                File_Size = "Loading File Size",
+                Downloads = "Loading Downloads",
+                Dependencies = "Loading Dependencies",
+                raw_size = "Loading Raw Size",
+                raw_date = "Loading Raw Date",
+                Update_data = "Loading Update Data",
+                Button_label = "Loading Button Label",
+                Button_Color = "Loading Button Color",
+                is_Favourite_ = 0,
+                is_NSFW = 0
+            };
+
+            Thunderstore_List.Items.Add(loadingCard);
+        }
 
+        // Function to replace the loading card with the populated data from TS_MOD
+        void ReplaceLoadingCardWithMod(Grid_ tsMod)
+        {
+            // Find the index of the first occurrence of the loading card
+            int loadingCardIndex = Thunderstore_List.Items.IndexOf(Thunderstore_List.Items.OfType<Grid_>().FirstOrDefault(card => card.Tag == "Loading"));
+
+            // Replace the loading card with the populated data from TS_MOD
+            Thunderstore_List.Items[loadingCardIndex] = tsMod;
+        }
         private void loadConvertItemLazy( bool Search_ = false, string SearchQuery = "#")
         {
             //for (int i = 0; i < _updater.Thunderstore.Length; i++)
             //{
-                foreach (var TS_MOD in _updater.Thunderstore) { 
-                Grid_ Card =  LoadListViewItem(TS_MOD, Search_, SearchQuery.Replace(" ", "_"));
 
-                if (Card != null)
-                {
-                    Thunderstore_List.Items.Add(Card);
+            //int listSize = _updater.Thunderstore.Count();
 
-                }
+            //// Add the loading cards representing the list size
+            //for (int i = 0; i < listSize; i++)
+            //{
+            //    AddLoadingCard();
+            //}
+            foreach (var TS_MOD in _updater.Thunderstore)
+            {
+                //Legacy Grid_ Card = LoadListViewItem(TS_MOD, Search_, SearchQuery.Replace(" ", "_"));
+                AsyncLoadListViewItem(TS_MOD, Search_, SearchQuery.Replace(" ", "_"));
+            //    if (Card != null)
+            //    {
+            //    Thunderstore_List.Items.Add(Card);
+            //   // ReplaceLoadingCardWithMod(Card);
+
+            //}
 
             }
         }
@@ -3541,11 +4010,11 @@ public async Task Unpack_To_Location_Custom(string Target_Zip, string Destinatio
                     Destinfo.Attributes &= ~FileAttributes.ReadOnly;
                     if (Script.Length != 0 && Script.Length <= 1)
                     {
-                        if (File.Exists(Path.Combine(Destination, "manifest.json")))
-                        {
-                            // If file found, delete it    
-                            await TryDeleteFile(Path.Combine(Destination, "manifest.json"));
-                        }
+                        //if (File.Exists(Path.Combine(Destination, "manifest.json")))
+                        //{
+                        //    // If file found, delete it    
+                        //    await TryDeleteFile(Path.Combine(Destination, "manifest.json"));
+                        //}
                         var File_ = Script.FirstOrDefault();
 
 
diff --git a/VTOL_2.0.0/Pages/Page_Tools.xaml b/VTOL_2.0.0/Pages/Page_Tools.xaml
index 1a39a517..92b25754 100644
--- a/VTOL_2.0.0/Pages/Page_Tools.xaml
+++ b/VTOL_2.0.0/Pages/Page_Tools.xaml
@@ -392,6 +392,7 @@
                     </Border>
                 </Grid>
             </TabItem>-->
+           <!---
             <TabItem Header="Advocate">
                 <hc:ScrollViewer  Padding="8,8,8,8"  MouseDown="ScrollViewer_MouseDown" Height="514">
 
@@ -420,7 +421,6 @@
                                 <ImageBrush Stretch="UniformToFill" />
                             </hc:DashedBorder.Background>
                         </hc:DashedBorder>
-                        <!--<hc:ImageSelector x:Name="Icon_Image" Height="256" VerticalAlignment="Top" Margin="0,212,0,0"  HorizontalAlignment="Center" Width="256" Background="#FF292929" Filter="(.png)|*.png" DefaultExt=".png" OverridesDefaultStyle="True" StrokeThickness="2" ImageSelected="Icon_Image_ImageSelected" IsManipulationEnabled="True" RenderTransformOrigin="0.499,0.502"/>-->
 
                         <RichTextBox x:Name="Description_Box_Advocate" Background="#FF373737" Height="151" VerticalAlignment="Top" BorderBrush="{x:Null}" SelectionTextBrush="{x:Null}" CaretBrush="White" AutomationProperties.HelpText="Log Area" AcceptsTab="True" IsDocumentEnabled="True" IsManipulationEnabled="True" FontFamily="Segoe UI" Margin="84,640,84,0" OverridesDefaultStyle="False">
                             <FlowDocument>
@@ -433,7 +433,6 @@
                         </RichTextBox>
                         <Button x:Name="Output_Button_Advocate"  Height="35" Margin="0,1025,100,0" VerticalAlignment="Top" BorderBrush="{x:Null}" Content="{x:Static properties:Language.Page_Tools_OutputDirectory}" Padding="0,0,0,0" Width="180" RenderTransformOrigin="0.411,0.429" HorizontalAlignment="Right" ToolTip="Manually Specify the Output Directory" Click="Output_Button_Advocate_Click" Background="#FF383838" ClickMode="Press"/>
                         <TextBox x:Name="Output_Box_Advocate" Margin="84,1025,285,0" TextWrapping="Wrap" Text="Output Path" VerticalAlignment="Top" Background="#FF171717" Foreground="White" SelectionTextBrush="White" CaretBrush="White"/>
-                        <!--<Button x:Name="Editor"  Height="30" Margin="281,476,281,0" VerticalAlignment="Top" BorderBrush="{x:Null}" Content="Editor" Padding="0,0,0,0" Click="Editor_Copy_Click" ToolTip="Open The In Built Image Editor" HorizontalAlignment="Stretch" LayoutUpdated="Editor_LayoutUpdated" Visibility="Collapsed" />-->
 
                         <Button x:Name="Save_Mod_Advocate"  Height="39" Margin="84,1089,100,0" VerticalAlignment="Top" BorderBrush="{x:Null}" Content="{x:Static properties:Language.Page_Tools_ConvertSkin}" Padding="0,0,0,0" HorizontalAlignment="Stretch" ToolTip="Save the mod to the Specified Path" Click="Save_Mod_Advocate_Click" Background="#FF383838" ClickMode="Press" />
                         <Label Content="{x:Static properties:Language.Page_Tools_VersionNumber}" Width="113" Background="{x:Null}" BorderBrush="{x:Null}" FontWeight="Normal" FontFamily="Gadugi" Height="19" Padding="0,0,0,0" Margin="211,854,0,0" VerticalAlignment="Top" HorizontalAlignment="Left"/>
@@ -464,12 +463,11 @@
 
                 </hc:ScrollViewer>
             </TabItem>
+            -->
             <TabItem Header="External Tools">
-                <hc:ScrollViewer  MouseDown="ScrollViewer_MouseDown" Height="514" Padding="9,9,9,9">
-
-
-                    <Grid Height="1402"  >
-                        <Border BorderThickness="1" Margin="31,-377,0,690" Background="#FF404240" CornerRadius="5,5,5,5" HorizontalAlignment="Left" Width="473" Height="304">
+             
+                <Grid  Height="1725" >
+                        <Border BorderThickness="1" Margin="31,-415,0,690" Background="#FF404240" CornerRadius="5,5,5,5" HorizontalAlignment="Left" Width="473" Height="304">
                             <Grid  >
 
                                 <Label Margin="10,180,0,88" Content="LEGION+" FontSize="22" Foreground="White" HorizontalContentAlignment="Left" HorizontalAlignment="Left" Width="297" Background="{x:Null}"/>
@@ -680,8 +678,7 @@
                             </Grid  >
 
                         </Border>
-                    </Grid>
-                </hc:ScrollViewer>
+                </Grid>
             </TabItem>
             <!--<TabItem Header="Profile">
                 <Grid   Height="514">
diff --git a/VTOL_2.0.0/Pages/Page_Tools.xaml.cs b/VTOL_2.0.0/Pages/Page_Tools.xaml.cs
index 0f50554b..34bccb74 100644
--- a/VTOL_2.0.0/Pages/Page_Tools.xaml.cs
+++ b/VTOL_2.0.0/Pages/Page_Tools.xaml.cs
@@ -407,9 +407,9 @@ public class Item
         public string Name { get; set; }
         public string Category { get; set; }
     }
-   
 
-public partial class Page_Tools : Page
+
+    public partial class Page_Tools : Page
     {
 
         Window_Tool_Image_Editor_Wizard Img_ed;
@@ -422,9 +422,9 @@ public partial class Page_Tools : Page
         string SelectedWeapon = null;
         int ImageNumber = 0;
         public string Tools_Dir;
-      
-       
-    public Page_Tools()
+
+
+        public Page_Tools()
         {
             InitializeComponent();
             try
@@ -449,7 +449,7 @@ YOUR DESCRIPTION
 //Example image, remove me before publishing!
 //![Imgur](https://i.imgur.com/hdnNWZQ.jpeg)");
                 Mod_Adv_Repak_Path = Properties.Settings.Default.REpak_Folder_Path;
-                Zip_Box_Advocate_Copy.Text = Mod_Adv_Repak_Path;
+                //Zip_Box_Advocate_Copy.Text = Mod_Adv_Repak_Path;
 
                 paragraph.Inlines.Add(run);
                 Description_Box.Document.Blocks.Add(paragraph);
@@ -625,10 +625,10 @@ YOUR DESCRIPTION
             }
 
         }
-      
-        
 
-       
+
+
+
         private static MainWindow GetMainWindow()
         {
             MainWindow mainWindow = null;
@@ -1974,8 +1974,8 @@ private void SaveTexture(string filename, MagickImage image, ZipArchive archive,
             }
         }
 
-       
-   
+
+
 
         private void Items_List_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
@@ -2038,8 +2038,8 @@ private void Button_Click(object sender, RoutedEventArgs e)
                 else
                     Output_Directory.Text = dialog.SelectedPath;
 
-                }
             }
+        }
 
 
 
@@ -2060,413 +2060,408 @@ private void Button_Click(object sender, RoutedEventArgs e)
         string Mod_Adv_Version_Num;
         string Mod_Adv_Skin_Name;
         string Mod_Adv_Output_Path;
-        public void Convert()
-        {
-            try {
-             
-                Mod_Adv_Version_Num = Mod_version_number_Advocate.Text;
-                Mod_Adv_Author_name = Mod_Author_Name_Advocate.Text;
-                Mod_Adv_Skin_Name = Mod_Skin_Name_Advocate.Text;
-               
-            if(Mod_Adv_Author_name == null || Mod_Adv_Author_name == "" || Mod_Adv_Author_name.Count() < 2)
-            {
-                SnackBar.Appearance = ControlAppearance.Danger;
-                SnackBar.Title = "ERROR";
-                SnackBar.Message = "Author Name Is Minimum 2 Letters";
-                SnackBar.Show();
-            }
-            if (Mod_Adv_Version_Num == null || Mod_Adv_Version_Num == "" || Mod_Adv_Version_Num.Count() < 2 || !Regex.Match(Mod_Adv_Version_Num, "^\\d+.\\d+.\\d+$").Success)
-            {
-                SnackBar.Appearance = ControlAppearance.Danger;
-                SnackBar.Title = "ERROR";
-                SnackBar.Message = "Version Number Is Invalid";
-                SnackBar.Show();
-            }
-            if (Mod_Adv_Skin_Name == null || Mod_Adv_Skin_Name == "" || Mod_Adv_Skin_Name.Count() < 2)
-            {
-                SnackBar.Appearance = ControlAppearance.Danger;
-                SnackBar.Title = "ERROR";
-                SnackBar.Message = "Skin Name Is Is Invalid";
-                SnackBar.Show();
-            }
-
-                if (Description_Box_Advocate.Document.Blocks.Count < 1)
-                {
-                    SnackBar.Appearance = ControlAppearance.Danger;
-                    SnackBar.Title = "ERROR";
-                    SnackBar.Message = "Description Is Invalid";
-                    SnackBar.Show();
-                }
-                if (!File.Exists(Mod_Adv_Skin_Path))
-            {
-
-           
-                SnackBar.Appearance = ControlAppearance.Danger;
-                SnackBar.Title = "ERROR";
-                SnackBar.Message = "Skin Content Is Invalid!";
-                SnackBar.Show();
-                return;
-            }
-            if (!Directory.Exists(Mod_Adv_Output_Path))
-            {
-                
-
-            
-                SnackBar.Appearance = ControlAppearance.Danger;
-                SnackBar.Title = "ERROR";
-                SnackBar.Message = "Output Path Is Invalid!";
-                SnackBar.Show();
-                return;
-            }
-            if (!File.Exists(Mod_Adv_Repak_Path))
-            {
+        //public void Convert()
+        //{
+        //    try {
 
+        //        //Mod_Adv_Version_Num = Mod_version_number_Advocate.Text;
+        //        //Mod_Adv_Author_name = Mod_Author_Name_Advocate.Text;
+        //        //Mod_Adv_Skin_Name = Mod_Skin_Name_Advocate.Text;
 
-           
-            
-                SnackBar.Appearance = ControlAppearance.Danger;
-                SnackBar.Title = "ERROR";
-                SnackBar.Message = "RePak Path Is Invalid!";
-                SnackBar.Show();
-                return;
-            }
-            if (!File.Exists(Mod_Adv_Icon_Path))
-            {
+        //    if(Mod_Adv_Author_name == null || Mod_Adv_Author_name == "" || Mod_Adv_Author_name.Count() < 2)
+        //    {
+        //        SnackBar.Appearance = ControlAppearance.Danger;
+        //        SnackBar.Title = "ERROR";
+        //        SnackBar.Message = "Author Name Is Minimum 2 Letters";
+        //        SnackBar.Show();
+        //    }
+        //    if (Mod_Adv_Version_Num == null || Mod_Adv_Version_Num == "" || Mod_Adv_Version_Num.Count() < 2 || !Regex.Match(Mod_Adv_Version_Num, "^\\d+.\\d+.\\d+$").Success)
+        //    {
+        //        SnackBar.Appearance = ControlAppearance.Danger;
+        //        SnackBar.Title = "ERROR";
+        //        SnackBar.Message = "Version Number Is Invalid";
+        //        SnackBar.Show();
+        //    }
+        //    if (Mod_Adv_Skin_Name == null || Mod_Adv_Skin_Name == "" || Mod_Adv_Skin_Name.Count() < 2)
+        //    {
+        //        SnackBar.Appearance = ControlAppearance.Danger;
+        //        SnackBar.Title = "ERROR";
+        //        SnackBar.Message = "Skin Name Is Is Invalid";
+        //        SnackBar.Show();
+        //    }
 
+        //        //if (Description_Box_Advocate.Document.Blocks.Count < 1)
+        //        //{
+        //        //    SnackBar.Appearance = ControlAppearance.Danger;
+        //        //    SnackBar.Title = "ERROR";
+        //        //    SnackBar.Message = "Description Is Invalid";
+        //        //    SnackBar.Show();
+        //        //}
+        //        if (!File.Exists(Mod_Adv_Skin_Path))
+        //    {
 
-           
-                SnackBar.Appearance = ControlAppearance.Danger;
-                SnackBar.Title = "ERROR";
-                SnackBar.Message = "Icon Content Is Invalid!";
-                SnackBar.Show();
-                return;
-            }
 
-                // the temp path is appended with the current date and time to prevent duplicates
-                string tempFolderPath = Path.GetTempPath() + "/Advocate/" + DateTime.Now.ToString("yyyyMMdd-THHmmss");
-                string skinTempFolderPath = Path.GetFullPath(tempFolderPath + "/Skin");
-                string modTempFolderPath = Path.GetFullPath(tempFolderPath + "/Mod");
-                string repakTempFolderPath = Path.GetFullPath(tempFolderPath + "/RePak");
+        //        SnackBar.Appearance = ControlAppearance.Danger;
+        //        SnackBar.Title = "ERROR";
+        //        SnackBar.Message = "Skin Content Is Invalid!";
+        //        SnackBar.Show();
+        //        return;
+        //    }
+        //    if (!Directory.Exists(Mod_Adv_Output_Path))
+        //    {
 
-                // try convert stuff, if we get a weird exception, don't crash preferably
-                try
-            {
-                /////////////////////////////
-                // create temp directories //
-                /////////////////////////////
 
-                    //
-                // directory for unzipped file
-               TryCreateDirectory(skinTempFolderPath);
 
-                // directory for TS-compliant mod
-               TryCreateDirectory(modTempFolderPath);
+        //        SnackBar.Appearance = ControlAppearance.Danger;
+        //        SnackBar.Title = "ERROR";
+        //        SnackBar.Message = "Output Path Is Invalid!";
+        //        SnackBar.Show();
+        //        return;
+        //    }
+        //    if (!File.Exists(Mod_Adv_Repak_Path))
+        //    {
 
-                // directory for RePak things
-               TryCreateDirectory(repakTempFolderPath);
 
 
-                ///////////////////////////////
-                // unzip skin to temp folder //
-                ///////////////////////////////
 
+        //        SnackBar.Appearance = ControlAppearance.Danger;
+        //        SnackBar.Title = "ERROR";
+        //        SnackBar.Message = "RePak Path Is Invalid!";
+        //        SnackBar.Show();
+        //        return;
+        //    }
+        //    if (!File.Exists(Mod_Adv_Icon_Path))
+        //    {
 
-                try
-                {
-                    ZipFile.ExtractToDirectory(Mod_Adv_Skin_Path, skinTempFolderPath, true);
-                }
-                catch (InvalidDataException ex)
-                    {
-                        Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
 
-                        SnackBar.Appearance = ControlAppearance.Danger;
-                    SnackBar.Title = "ERROR";
-                    SnackBar.Message = "Unable to unzip skin!";
-                    SnackBar.Show();
-                    return;
-                        
-                }
 
+        //        SnackBar.Appearance = ControlAppearance.Danger;
+        //        SnackBar.Title = "ERROR";
+        //        SnackBar.Message = "Icon Content Is Invalid!";
+        //        SnackBar.Show();
+        //        return;
+        //    }
 
-                ////////////////////////////////////
-                // create temp mod file structure //
-                ////////////////////////////////////
+        //        // the temp path is appended with the current date and time to prevent duplicates
+        //        string tempFolderPath = Path.GetTempPath() + "/Advocate/" + DateTime.Now.ToString("yyyyMMdd-THHmmss");
+        //        string skinTempFolderPath = Path.GetFullPath(tempFolderPath + "/Skin");
+        //        string modTempFolderPath = Path.GetFullPath(tempFolderPath + "/Mod");
+        //        string repakTempFolderPath = Path.GetFullPath(tempFolderPath + "/RePak");
 
+        //        // try convert stuff, if we get a weird exception, don't crash preferably
+        //        try
+        //    {
+        //        /////////////////////////////
+        //        // create temp directories //
+        //        /////////////////////////////
+
+        //            //
+        //        // directory for unzipped file
+        //       TryCreateDirectory(skinTempFolderPath);
+
+        //        // directory for TS-compliant mod
+        //       TryCreateDirectory(modTempFolderPath);
+
+        //        // directory for RePak things
+        //       TryCreateDirectory(repakTempFolderPath);
+
+
+        //        ///////////////////////////////
+        //        // unzip skin to temp folder //
+        //        ///////////////////////////////
+
+
+        //        try
+        //        {
+        //            ZipFile.ExtractToDirectory(Mod_Adv_Skin_Path, skinTempFolderPath, true);
+        //        }
+        //        catch (InvalidDataException ex)
+        //            {
+        //                Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
+
+        //                SnackBar.Appearance = ControlAppearance.Danger;
+        //            SnackBar.Title = "ERROR";
+        //            SnackBar.Message = "Unable to unzip skin!";
+        //            SnackBar.Show();
+        //            return;
+
+        //        }
+
+
+        //        ////////////////////////////////////
+        //        // create temp mod file structure //
+        //        ////////////////////////////////////
+
+
+        //       TryCreateDirectory(modTempFolderPath + "\\mods\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + "\\paks");
+
+
+        //        /////////////////////
+        //        // create icon.png //
+        //        /////////////////////
+
+        //        if (Mod_Adv_Icon_Path == "")
+        //        {
+        //            // fuck you, im using the col of the first folder i find, shouldve specified an icon path
+        //            string[] skinPaths = Directory.GetDirectories(skinTempFolderPath);
+        //            if (skinPaths.Length == 0)
+        //            {
+        //                SnackBar.Appearance = ControlAppearance.Danger;
+        //                SnackBar.Title = "ERROR";
+        //                SnackBar.Message = "No Skins found in zip!";
+        //                SnackBar.Show();
+        //                return;
+        //            }
+        //            string[] resolutions = Directory.GetDirectories(skinPaths[0]);
+        //            if (resolutions.Length == 0)
+        //            {
+        //                SnackBar.Appearance = ControlAppearance.Danger;
+        //                SnackBar.Title = "ERROR";
+        //                SnackBar.Message = "No Skins found in zip!";
+        //                SnackBar.Show();
+        //                return;
+        //            }
+        //            // find highest resolution folder
+        //            int highestRes = 0;
+        //            foreach (string resolution in resolutions)
+        //            {
+        //                string? thing = Path.GetFileName(resolution);
+        //                // check if higher than highestRes and a power of 2
+        //                if (int.TryParse(thing, out int res) && res > highestRes && (highestRes & (highestRes - 1)) == 0)
+        //                {
+        //                    highestRes = res;
+        //                }
+        //            }
+        //            // check that we actually found something
+        //            if (highestRes == 0)
+        //            {
+        //                SnackBar.Appearance = ControlAppearance.Danger;
+        //                SnackBar.Title = "ERROR";
+        //                SnackBar.Message = "No valid image resolutions found in zip!";
+        //                SnackBar.Show();
+        //                return;
+        //            }
+
+        //            string[] files = Directory.GetFiles(skinPaths[0] + "\\" + highestRes.ToString());
+        //            if (files.Length == 0)
+        //            {
+        //                SnackBar.Appearance = ControlAppearance.Danger;
+        //                SnackBar.Title = "ERROR";
+        //                SnackBar.Message = "No files in highest resolution folder!";
+        //                SnackBar.Show();
+        //                return;
+        //            }
+        //            // find _col file
+        //            string colPath = "";
+        //            foreach (string file in files)
+        //            {
+        //                if (file.EndsWith("_col.dds"))
+        //                {
+        //                    colPath = file;
+        //                    break;
+        //                }
+        //            }
+        //            if (colPath == "")
+        //            {
+        //                SnackBar.Appearance = ControlAppearance.Danger;
+        //                SnackBar.Title = "ERROR";
+        //                SnackBar.Message = "No _col texture found in highest resolution folder";
+        //                SnackBar.Show();
+        //                return;
+        //            }
+
+        //            if (!DdsToPng(colPath, modTempFolderPath + "\\icon.png"))
+        //            {
+        //                SnackBar.Appearance = ControlAppearance.Danger;
+        //                SnackBar.Title = "ERROR";
+        //                SnackBar.Message = "Failed to convert dds to png for icon!";
+        //                SnackBar.Show();
+        //                return;
+        //            }
+        //        }
+        //        else
+        //        {
+        //            // check that png is correct size
+        //            System.Drawing.Image img = System.Drawing.Image.FromFile(Mod_Adv_Icon_Path);
+
+
+        //            // copy png over
+        //            TryCopyFile(Mod_Adv_Icon_Path, modTempFolderPath + "\\icon.png",true);
+        //        }
+
+        //            //    ConvertTaskComplete();
+
+        //            //////////////////////
+        //            // create README.md //
+        //            //////////////////////
+
+        //   //         if (Description_Box_Advocate.Document.Blocks.Count > 1)
+        //   //     {
+        //   //             TextRange textRange = new TextRange(
+        //   //    // TextPointer to the start of content in the RichTextBox.
+        //   //    Description_Box_Advocate.Document.ContentStart,
+        //   //    // TextPointer to the end of content in the RichTextBox.
+        //   //    Description_Box_Advocate.Document.ContentEnd
+        //   //);
+
+        //                // The Text property on a TextRange object returns a string
+        //                // representing the plain text content of the TextRange.
+
+
+        //                File.WriteAllText(modTempFolderPath + "\\README.md", textRange.Text);
+        //        }
+        //        else
+        //        {
+        //            SnackBar.Appearance = ControlAppearance.Danger;
+        //            SnackBar.Title = "ERROR";
+        //            SnackBar.Message = "No files in highest resolution folder!";
+        //            SnackBar.Show();
+
+        //        }
+
+
+        //        //////////////////////////
+        //        // create manifest.json //
+        //        //////////////////////////
+
+
+        //        string manifest = string.Format("{{\n\"name\":\"{0}\",\n\"version_number\":\"{1}\",\n\"website_url\":\"\",\n\"dependencies\":[],\n\"description\":\"{2}\"\n}}", Mod_Adv_Skin_Name.Replace(' ', '_'), Mod_Adv_Version_Num, string.Format("Skin made by {0}", Mod_Adv_Author_name));
+        //        File.WriteAllText(modTempFolderPath + "\\manifest.json", manifest);
+
+
+        //        /////////////////////
+        //        // create mod.json //
+        //        /////////////////////
+
+
+        //        string modJson = string.Format("{{\n\"Name\": \"{0}\",\n\"Description\": \"\",\n\"Version\": \"{1}\",\n\"LoadPriority\": 1,\n\"ConVars\":[],\n\"Scripts\":[],\n\"Localisation\":[]\n}}", Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name, Mod_Adv_Version_Num);
+        //        File.WriteAllText(modTempFolderPath + "\\mods\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + "\\mod.json", modJson);
 
-               TryCreateDirectory(modTempFolderPath + "\\mods\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + "\\paks");
 
+        //            //////////////////////////////////////////////////////////////////
+        //            // create map.json and move textures to temp folder for packing //
+        //            //////////////////////////////////////////////////////////////////
 
-                /////////////////////
-                // create icon.png //
-                /////////////////////
+        //            Advocate.Conversion.JSON.Map map = new(Mod_Adv_Skin_Name, $"{repakTempFolderPath}/assets", $"{modTempFolderPath}/mods/{Mod_Adv_Author_name}.{Mod_Adv_Skin_Name}/paks");
 
-                if (Mod_Adv_Icon_Path == "")
-                {
-                    // fuck you, im using the col of the first folder i find, shouldve specified an icon path
-                    string[] skinPaths = Directory.GetDirectories(skinTempFolderPath);
-                    if (skinPaths.Length == 0)
-                    {
-                        SnackBar.Appearance = ControlAppearance.Danger;
-                        SnackBar.Title = "ERROR";
-                        SnackBar.Message = "No Skins found in zip!";
-                        SnackBar.Show();
-                        return;
-                    }
-                    string[] resolutions = Directory.GetDirectories(skinPaths[0]);
-                    if (resolutions.Length == 0)
-                    {
-                        SnackBar.Appearance = ControlAppearance.Danger;
-                        SnackBar.Title = "ERROR";
-                        SnackBar.Message = "No Skins found in zip!";
-                        SnackBar.Show();
-                        return;
-                    }
-                    // find highest resolution folder
-                    int highestRes = 0;
-                    foreach (string resolution in resolutions)
-                    {
-                        string? thing = Path.GetFileName(resolution);
-                        // check if higher than highestRes and a power of 2
-                        if (int.TryParse(thing, out int res) && res > highestRes && (highestRes & (highestRes - 1)) == 0)
-                        {
-                            highestRes = res;
-                        }
-                    }
-                    // check that we actually found something
-                    if (highestRes == 0)
-                    {
-                        SnackBar.Appearance = ControlAppearance.Danger;
-                        SnackBar.Title = "ERROR";
-                        SnackBar.Message = "No valid image resolutions found in zip!";
-                        SnackBar.Show();
-                        return;
-                    }
+        //            // this tracks the textures that we have already added to the json, so we can avoid duplicates in there
+        //            List<string> textures = new();
+        //            // this tracks the different skin types that we have found, for description parsing later
+        //            List<string> skinTypes = new();
 
-                    string[] files = Directory.GetFiles(skinPaths[0] + "\\" + highestRes.ToString());
-                    if (files.Length == 0)
-                    {
-                        SnackBar.Appearance = ControlAppearance.Danger;
-                        SnackBar.Title = "ERROR";
-                        SnackBar.Message = "No files in highest resolution folder!";
-                        SnackBar.Show();
-                        return;
-                    }
-                    // find _col file
-                    string colPath = "";
-                    foreach (string file in files)
-                    {
-                        if (file.EndsWith("_col.dds"))
-                        {
-                            colPath = file;
-                            break;
-                        }
-                    }
-                    if (colPath == "")
-                    {
-                        SnackBar.Appearance = ControlAppearance.Danger;
-                        SnackBar.Title = "ERROR";
-                        SnackBar.Message = "No _col texture found in highest resolution folder";
-                        SnackBar.Show();
-                        return;
-                    }
+        //            // this keeps track of the different DDS files we are handling and combining
+        //            // the key is the texture name (example: CAR_Default_col)
+        //            Dictionary<string, Advocate.DDS.Manager> ddsManagers = new();
+        //            /* The plan here is to:
+        //             * 1. find all textures, and put them into arrays/lists of mip sizes (where 2^index == image width/height)
+        //             * 2. take each dds, and rip the image data directly from it, putting them together to create as many mip levels as we can
+        //             * 3. create the lower level mips from the highest resolution image that we have
+        //             * (decompression and recompression harms image quality so we want to avoid this wherever we can)
+        //             * 4. put the raw image data for the mips into one dds file
+        //             * 
+        //             * ASSUMPTIONS:
+        //             * 1. the lower resolution images use the same compression format as the highest resolution image
+        //             * if this is not the case, log, and skip the lower level image (this means we have to generate more mip levels, which is bad)
+        //             * 
+        //             */
 
-                    if (!DdsToPng(colPath, modTempFolderPath + "\\icon.png"))
-                    {
-                        SnackBar.Appearance = ControlAppearance.Danger;
-                        SnackBar.Title = "ERROR";
-                        SnackBar.Message = "Failed to convert dds to png for icon!";
-                        SnackBar.Show();
-                        return;
-                    }
-                }
-                else
-                {
-                    // check that png is correct size
-                    System.Drawing.Image img = System.Drawing.Image.FromFile(Mod_Adv_Icon_Path);
-                  
+        //            // find all DDS files within the zip folder
+        //            string[] ddsImages = Directory.GetFiles(skinTempFolderPath, "*.dds", SearchOption.AllDirectories);
 
-                    // copy png over
-                    TryCopyFile(Mod_Adv_Icon_Path, modTempFolderPath + "\\icon.png",true);
-                }
+        //            // add all of the files to their respective DDS Managers
+        //            foreach (string path in ddsImages)
+        //            {
+        //                string filename = Path.GetFileNameWithoutExtension(path);
 
-                    //    ConvertTaskComplete();
+        //                // create a new DDS.Manager if needed
+        //                if (!ddsManagers.ContainsKey(filename))
+        //                {
+        //                  //  Debug($"Found new texture type '{filename}', creating Manager.");
+        //                    ddsManagers.Add(filename, new Advocate.DDS.Manager());
+        //                }
 
-                    //////////////////////
-                    // create README.md //
-                    //////////////////////
-                   
-                    if (Description_Box_Advocate.Document.Blocks.Count > 1)
-                {
-                        TextRange textRange = new TextRange(
-               // TextPointer to the start of content in the RichTextBox.
-               Description_Box_Advocate.Document.ContentStart,
-               // TextPointer to the end of content in the RichTextBox.
-               Description_Box_Advocate.Document.ContentEnd
-           );
-
-                        // The Text property on a TextRange object returns a string
-                        // representing the plain text content of the TextRange.
-                         
-
-                        File.WriteAllText(modTempFolderPath + "\\README.md", textRange.Text);
-                }
-                else
-                {
-                    SnackBar.Appearance = ControlAppearance.Danger;
-                    SnackBar.Title = "ERROR";
-                    SnackBar.Message = "No files in highest resolution folder!";
-                    SnackBar.Show();
+        //                // read the dds file into the Manager
+        //              //  Debug($"Adding new image for texture type '{filename}' from path '{path}'");
+        //                BinaryReader reader = new(new FileStream(path, FileMode.Open));
+        //                ddsManagers[filename].LoadImage(reader);
+        //                reader.Close();
 
-                }
+        //                // add texture to skinTypes for tracking which skins are in the package
+        //                string type = Path.GetFileNameWithoutExtension(path).Split("_")[0];
+        //                if (!skinTypes.Contains(type))
+        //                {
+        //                  //  Debug($"Found new skin type for description handling ({type})");
+        //                    skinTypes.Add(type);
+        //                }
+        //            }
 
+        //            // save all dds images
+        //            foreach (KeyValuePair<string, Advocate.DDS.Manager> pair in ddsManagers)
+        //            {
+        //                string texturePath = TextureNameToPath(pair.Key);
+        //                if (texturePath == "")
+        //                {
+        //                   // Logging.Logger.Error($"Failed to find texture path for {pair.Key}");
+        //                  //  return false;
+        //                }
+        //                string filePath = $"{repakTempFolderPath}/assets/{texturePath}.dds";
+        //                // writer doesnt create directories, so do it beforehand
+        //                Directory.CreateDirectory(Path.GetDirectoryName(filePath));
 
-                //////////////////////////
-                // create manifest.json //
-                //////////////////////////
+        //                //Debug($"Saving texture (with {pair.Value.MipMapCount} mips) to path '{filePath}'");
 
+        //                // create writer and save the image
+        //                BinaryWriter writer = new(new FileStream(filePath, FileMode.Create));
 
-                string manifest = string.Format("{{\n\"name\":\"{0}\",\n\"version_number\":\"{1}\",\n\"website_url\":\"\",\n\"dependencies\":[],\n\"description\":\"{2}\"\n}}", Mod_Adv_Skin_Name.Replace(' ', '_'), Mod_Adv_Version_Num, string.Format("Skin made by {0}", Mod_Adv_Author_name));
-                File.WriteAllText(modTempFolderPath + "\\manifest.json", manifest);
+        //                // generate missing mips
+        //                if (pair.Value.HasMissingMips())
+        //                {
+        //                   // Debug($"Texture being saved to '{filePath}' has missing mip levels");
+        //                   // Info($"Generating MipMaps... ({pair.Key})");
 
 
-                /////////////////////
-                // create mod.json //
-                /////////////////////
 
 
-                string modJson = string.Format("{{\n\"Name\": \"{0}\",\n\"Description\": \"\",\n\"Version\": \"{1}\",\n\"LoadPriority\": 1,\n\"ConVars\":[],\n\"Scripts\":[],\n\"Localisation\":[]\n}}", Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name, Mod_Adv_Version_Num);
-                File.WriteAllText(modTempFolderPath + "\\mods\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + "\\mod.json", modJson);
 
 
-                    //////////////////////////////////////////////////////////////////
-                    // create map.json and move textures to temp folder for packing //
-                    //////////////////////////////////////////////////////////////////
 
-                    Advocate.Conversion.JSON.Map map = new(Mod_Adv_Skin_Name, $"{repakTempFolderPath}/assets", $"{modTempFolderPath}/mods/{Mod_Adv_Author_name}.{Mod_Adv_Skin_Name}/paks");
 
-                    // this tracks the textures that we have already added to the json, so we can avoid duplicates in there
-                    List<string> textures = new();
-                    // this tracks the different skin types that we have found, for description parsing later
-                    List<string> skinTypes = new();
 
-                    // this keeps track of the different DDS files we are handling and combining
-                    // the key is the texture name (example: CAR_Default_col)
-                    Dictionary<string, Advocate.DDS.Manager> ddsManagers = new();
-                    /* The plan here is to:
-                     * 1. find all textures, and put them into arrays/lists of mip sizes (where 2^index == image width/height)
-                     * 2. take each dds, and rip the image data directly from it, putting them together to create as many mip levels as we can
-                     * 3. create the lower level mips from the highest resolution image that we have
-                     * (decompression and recompression harms image quality so we want to avoid this wherever we can)
-                     * 4. put the raw image data for the mips into one dds file
-                     * 
-                     * ASSUMPTIONS:
-                     * 1. the lower resolution images use the same compression format as the highest resolution image
-                     * if this is not the case, log, and skip the lower level image (this means we have to generate more mip levels, which is bad)
-                     * 
-                     */
 
-                    // find all DDS files within the zip folder
-                    string[] ddsImages = Directory.GetFiles(skinTempFolderPath, "*.dds", SearchOption.AllDirectories);
 
-                    // add all of the files to their respective DDS Managers
-                    foreach (string path in ddsImages)
-                    {
-                        string filename = Path.GetFileNameWithoutExtension(path);
 
-                        // create a new DDS.Manager if needed
-                        if (!ddsManagers.ContainsKey(filename))
-                        {
-                          //  Debug($"Found new texture type '{filename}', creating Manager.");
-                            ddsManagers.Add(filename, new Advocate.DDS.Manager());
-                        }
 
-                        // read the dds file into the Manager
-                      //  Debug($"Adding new image for texture type '{filename}' from path '{path}'");
-                        BinaryReader reader = new(new FileStream(path, FileMode.Open));
-                        ddsManagers[filename].LoadImage(reader);
-                        reader.Close();
 
-                        // add texture to skinTypes for tracking which skins are in the package
-                        string type = Path.GetFileNameWithoutExtension(path).Split("_")[0];
-                        if (!skinTypes.Contains(type))
-                        {
-                          //  Debug($"Found new skin type for description handling ({type})");
-                            skinTypes.Add(type);
-                        }
-                    }
 
-                    // save all dds images
-                    foreach (KeyValuePair<string, Advocate.DDS.Manager> pair in ddsManagers)
-                    {
-                        string texturePath = TextureNameToPath(pair.Key);
-                        if (texturePath == "")
-                        {
-                           // Logging.Logger.Error($"Failed to find texture path for {pair.Key}");
-                          //  return false;
-                        }
-                        string filePath = $"{repakTempFolderPath}/assets/{texturePath}.dds";
-                        // writer doesnt create directories, so do it beforehand
-                        Directory.CreateDirectory(Path.GetDirectoryName(filePath));
+        //                    //  pair.Value.GenerateMissingMips(texconvPath);
 
-                        //Debug($"Saving texture (with {pair.Value.MipMapCount} mips) to path '{filePath}'");
 
-                        // create writer and save the image
-                        BinaryWriter writer = new(new FileStream(filePath, FileMode.Create));
+        //                }
 
-                        // generate missing mips
-                        if (pair.Value.HasMissingMips())
-                        {
-                           // Debug($"Texture being saved to '{filePath}' has missing mip levels");
-                           // Info($"Generating MipMaps... ({pair.Key})");
-                         
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                            
-                            //  pair.Value.GenerateMissingMips(texconvPath);
+        //                pair.Value.Convert();
+        //                pair.Value.SaveImage(writer);
 
+        //                // close the writer
+        //                writer.Close();
 
-                        }
+        //                // add asset to map file
+        //                map.AddTextureAsset(texturePath);
 
-                        pair.Value.Convert();
-                        pair.Value.SaveImage(writer);
+        //                // add texturePath to tracked textures
+        //                textures.Add(texturePath);
+        //            }
 
-                        // close the writer
-                        writer.Close();
+        //            // write the map json
+        //          //
 
-                        // add asset to map file
-                        map.AddTextureAsset(texturePath);
 
-                        // add texturePath to tracked textures
-                        textures.Add(texturePath);
-                    }
 
-                    // write the map json
-                  //
-                  
-                    
-                    
-                    
-                    
-                    
-                    
-                    
-                    //File.WriteAllText($"{repakTempFolderPath}/map.json", JsonSerializer.Serialize<Advocate.Conversion.JSON.Map>(map, jsonOptions));
 
 
 
 
 
+        //            //File.WriteAllText($"{repakTempFolderPath}/map.json", JsonSerializer.Serialize<Advocate.Conversion.JSON.Map>(map, jsonOptions));
 
 
 
@@ -2477,215 +2472,220 @@ public void Convert()
 
 
 
-                //    string map = string.Format("{{\n\"name\":\"{0}\",\n\"assetsDir\":\"{1}\",\n\"outputDir\":\"{2}\",\n\"version\": 7,\n\"files\":[\n", Mod_Adv_Skin_Name, (repakTempFolderPath + "\\assets").Replace('\\', '/'), (modTempFolderPath + "\\mods\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + "\\paks").Replace('\\', '/'));
-                //// this tracks the textures that we have already added to the json, so we can avoid duplicates in there
-                //List<string> textures = new();
-                //bool isFirst = true;
-                //foreach (string skinPath in Directory.GetDirectories(skinTempFolderPath))
-                //    {// some skins have random files and folders in here, like images and stuff, so I have to do sorting in an annoying way
-                //        List<string> parsedDirs = new();
-                //        foreach (string dir in Directory.GetDirectories(skinPath))
-                //        {
-                //            // only add to the list of dirs
-                //            if (int.TryParse(Path.GetFileName(dir), out int val))
-                //            {
-                //                parsedDirs.Add(dir);
-                //            }
-                //        }
-                //        foreach (string resolution in Directory.GetDirectories(skinPath).OrderBy(path => int.Parse(Path.GetFileName(path))))
-                //    {
-                //        if (int.TryParse(Path.GetFileName(resolution), out int res))
-                //        {
-                //            foreach (string texture in Directory.GetFiles(resolution))
-                //            {
-                //                // move texture to temp folder for packing
-                //                // convert from skin tool syntax to actual texture path, gotta be hardcoded because pain
-                //                string texturePath = TextureNameToPath(Path.GetFileNameWithoutExtension(texture));
-                //                if (texturePath == "")
-                //                {
-                //                   // ConversionFailed(button, styleProperty, "Failed to convert texture '" + Path.GetFileNameWithoutExtension(texture) + "')");
-                //                    return;
-                //                }
 
-                //                // avoid duplicate textures in the json
-                //                if (!textures.Contains(texturePath))
-                //                {
-                //                    // dont add a comma on the first one
-                //                    if (!isFirst)
-                //                        map += ",\n";
-                //                    map += $"{{\n\"$type\":\"txtr\",\n\"path\":\"{texturePath}\",\n\"disableStreaming\":true,\n\"saveDebugName\":true\n}}";
-                //                    // add texture to tracked textures
-                //                    textures.Add(texturePath);
-                //                }
-                //                isFirst = false;
-                //                // copy file
-                //               TryCreateDirectory(Directory.GetParent($"{repakTempFolderPath}\\assets\\{texturePath}.dds").FullName);
 
-                //                DdsHandler handler = new(texture);
-                //                handler.Convert();
-                //                handler.Save($"{repakTempFolderPath}\\assets\\{texturePath}.dds");
-                //            }
-                //        }
-                //    }
-                //}
 
-                //// end the json
-                //map += "\n]\n}";
-                //File.WriteAllText(repakTempFolderPath + "\\map.json", map);
 
 
-                //////////////////////////
-                // pack using RePak.exe //
-                //////////////////////////
+        //        //    string map = string.Format("{{\n\"name\":\"{0}\",\n\"assetsDir\":\"{1}\",\n\"outputDir\":\"{2}\",\n\"version\": 7,\n\"files\":[\n", Mod_Adv_Skin_Name, (repakTempFolderPath + "\\assets").Replace('\\', '/'), (modTempFolderPath + "\\mods\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + "\\paks").Replace('\\', '/'));
+        //        //// this tracks the textures that we have already added to the json, so we can avoid duplicates in there
+        //        //List<string> textures = new();
+        //        //bool isFirst = true;
+        //        //foreach (string skinPath in Directory.GetDirectories(skinTempFolderPath))
+        //        //    {// some skins have random files and folders in here, like images and stuff, so I have to do sorting in an annoying way
+        //        //        List<string> parsedDirs = new();
+        //        //        foreach (string dir in Directory.GetDirectories(skinPath))
+        //        //        {
+        //        //            // only add to the list of dirs
+        //        //            if (int.TryParse(Path.GetFileName(dir), out int val))
+        //        //            {
+        //        //                parsedDirs.Add(dir);
+        //        //            }
+        //        //        }
+        //        //        foreach (string resolution in Directory.GetDirectories(skinPath).OrderBy(path => int.Parse(Path.GetFileName(path))))
+        //        //    {
+        //        //        if (int.TryParse(Path.GetFileName(resolution), out int res))
+        //        //        {
+        //        //            foreach (string texture in Directory.GetFiles(resolution))
+        //        //            {
+        //        //                // move texture to temp folder for packing
+        //        //                // convert from skin tool syntax to actual texture path, gotta be hardcoded because pain
+        //        //                string texturePath = TextureNameToPath(Path.GetFileNameWithoutExtension(texture));
+        //        //                if (texturePath == "")
+        //        //                {
+        //        //                   // ConversionFailed(button, styleProperty, "Failed to convert texture '" + Path.GetFileNameWithoutExtension(texture) + "')");
+        //        //                    return;
+        //        //                }
 
-             //   Message = "Packing using RePak...";
+        //        //                // avoid duplicate textures in the json
+        //        //                if (!textures.Contains(texturePath))
+        //        //                {
+        //        //                    // dont add a comma on the first one
+        //        //                    if (!isFirst)
+        //        //                        map += ",\n";
+        //        //                    map += $"{{\n\"$type\":\"txtr\",\n\"path\":\"{texturePath}\",\n\"disableStreaming\":true,\n\"saveDebugName\":true\n}}";
+        //        //                    // add texture to tracked textures
+        //        //                    textures.Add(texturePath);
+        //        //                }
+        //        //                isFirst = false;
+        //        //                // copy file
+        //        //               TryCreateDirectory(Directory.GetParent($"{repakTempFolderPath}\\assets\\{texturePath}.dds").FullName);
 
-                //var sb = new StringBuilder();
+        //        //                DdsHandler handler = new(texture);
+        //        //                handler.Convert();
+        //        //                handler.Save($"{repakTempFolderPath}\\assets\\{texturePath}.dds");
+        //        //            }
+        //        //        }
+        //        //    }
+        //        //}
 
-                Process P = new();
+        //        //// end the json
+        //        //map += "\n]\n}";
+        //        //File.WriteAllText(repakTempFolderPath + "\\map.json", map);
 
-                //P.StartInfo.RedirectStandardOutput = true;
-                //P.StartInfo.RedirectStandardError = true;
-                //P.OutputDataReceived += (sender, args) => sb.AppendLine(args.Data);
-                //P.ErrorDataReceived += (sender, args) => sb.AppendLine(args.Data);
-                //P.StartInfo.UseShellExecute = false;
-                P.StartInfo.FileName = Mod_Adv_Repak_Path;
-                P.StartInfo.Arguments = "\"" + repakTempFolderPath + "\\map.json\"";
-                P.Start();
-                //P.BeginOutputReadLine();
-                //P.BeginErrorReadLine();
-                P.WaitForExit();
 
-                if (P.ExitCode == 1)
-                {
-                  //  ConversionFailed(button, styleProperty, "RePak failed to pack the rpak!");
-                    return;
-                }
+        //        //////////////////////////
+        //        // pack using RePak.exe //
+        //        //////////////////////////
 
+        //     //   Message = "Packing using RePak...";
 
-                //////////////////////
-                // create rpak.json //
-                //////////////////////
+        //        //var sb = new StringBuilder();
 
+        //        Process P = new();
 
-                string rpakjson = string.Format("{{\n\"Preload\":\n{{\n\"{0}\":true\n}}\n}}", Mod_Adv_Skin_Name + ".rpak");
+        //        //P.StartInfo.RedirectStandardOutput = true;
+        //        //P.StartInfo.RedirectStandardError = true;
+        //        //P.OutputDataReceived += (sender, args) => sb.AppendLine(args.Data);
+        //        //P.ErrorDataReceived += (sender, args) => sb.AppendLine(args.Data);
+        //        //P.StartInfo.UseShellExecute = false;
+        //        P.StartInfo.FileName = Mod_Adv_Repak_Path;
+        //        P.StartInfo.Arguments = "\"" + repakTempFolderPath + "\\map.json\"";
+        //        P.Start();
+        //        //P.BeginOutputReadLine();
+        //        //P.BeginErrorReadLine();
+        //        P.WaitForExit();
 
-                File.WriteAllText(modTempFolderPath + "\\mods\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + "\\paks\\rpak.json", rpakjson);
+        //        if (P.ExitCode == 1)
+        //        {
+        //          //  ConversionFailed(button, styleProperty, "RePak failed to pack the rpak!");
+        //            return;
+        //        }
 
 
-                ///////////////////
-                // zip up result //
-                ///////////////////
+        //        //////////////////////
+        //        // create rpak.json //
+        //        //////////////////////
 
 
-                ZipFile.CreateFromDirectory(modTempFolderPath, tempFolderPath + "\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + ".zip");
+        //        string rpakjson = string.Format("{{\n\"Preload\":\n{{\n\"{0}\":true\n}}\n}}", Mod_Adv_Skin_Name + ".rpak");
 
+        //        File.WriteAllText(modTempFolderPath + "\\mods\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + "\\paks\\rpak.json", rpakjson);
 
-                ////////////////////////////////////
-                // move result out of temp folder //
-                ////////////////////////////////////
 
+        //        ///////////////////
+        //        // zip up result //
+        //        ///////////////////
+
+
+        //        ZipFile.CreateFromDirectory(modTempFolderPath, tempFolderPath + "\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + ".zip");
+
+
+        //        ////////////////////////////////////
+        //        // move result out of temp folder //
+        //        ////////////////////////////////////
+
+
+        //        TryMoveFile(tempFolderPath + "\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + ".zip", Mod_Adv_Output_Path + "\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + ".zip", true);
 
-                TryMoveFile(tempFolderPath + "\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + ".zip", Mod_Adv_Output_Path + "\\" + Mod_Adv_Author_name + "." + Mod_Adv_Skin_Name + ".zip", true);
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //            //Removed PaperTrailSystem Due to lack of reliability.
 
-            }
-            catch (Exception ex)
-            {
-                    //Removed PaperTrailSystem Due to lack of reliability.
+        //            SnackBar.Appearance = ControlAppearance.Danger;
+        //            SnackBar.Title = "ERROR";
+        //            SnackBar.Message = ex.Message;
+        //            SnackBar.Show();
+        //            Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
 
-                    SnackBar.Appearance = ControlAppearance.Danger;
-                    SnackBar.Title = "ERROR";
-                    SnackBar.Message = ex.Message;
-                    SnackBar.Show();
-                    Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
+        //            return;
+        //    }
+        //    finally
+        //    {
+        //            /////////////
+        //            // cleanup //
+        //            /////////////
 
-                    return;
-            }
-            finally
-            {
-                    /////////////
-                    // cleanup //
-                    /////////////
 
+        //            // delete temp folders
+        //            // delete temp folders
+        //            try
+        //            {
+        //                // delete temp folders
+        //                if (Directory.Exists(tempFolderPath))
+        //                    Directory.Delete(tempFolderPath, true);
+        //            }
+        //            catch (Exception ex)
+        //            {
 
-                    // delete temp folders
-                    // delete temp folders
-                    try
-                    {
-                        // delete temp folders
-                        if (Directory.Exists(tempFolderPath))
-                            Directory.Delete(tempFolderPath, true);
-                    }
-                    catch (Exception ex)
-                    {
-                       
-                    }
-                }
+        //            }
+        //        }
 
 
-            // everything is done and good
-            SnackBar.Appearance = ControlAppearance.Success;
-            SnackBar.Title = "SUCCESS";
-            SnackBar.Message = "Conversion Completed Successfully";
-            SnackBar.Show();
+        //    // everything is done and good
+        //    SnackBar.Appearance = ControlAppearance.Success;
+        //    SnackBar.Title = "SUCCESS";
+        //    SnackBar.Message = "Conversion Completed Successfully";
+        //    SnackBar.Show();
 
 
-            }
-            catch (Exception ex)
-            {
-              //Removed PaperTrailSystem Due to lack of reliability.
-                SnackBar.Appearance = ControlAppearance.Danger;
-                SnackBar.Title = "ERROR";
-                SnackBar.Message = ex.Message;
-                SnackBar.Show();
-                Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //      //Removed PaperTrailSystem Due to lack of reliability.
+        //        SnackBar.Appearance = ControlAppearance.Danger;
+        //        SnackBar.Title = "ERROR";
+        //        SnackBar.Message = ex.Message;
+        //        SnackBar.Show();
+        //        Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
 
-            }
+        //    }
 
 
-        }
+        //}
 
         private bool DdsToPng(string imagePath, string outputPath)
         {
-            try { 
-            // yoinked from pfim usage example
-            using (var image = Pfimage.FromFile(imagePath))
-            {
-                PixelFormat format;
-
-                // Convert from Pfim's backend agnostic image format into GDI+'s image format
-                switch (image.Format)
+            try {
+                // yoinked from pfim usage example
+                using (var image = Pfimage.FromFile(imagePath))
                 {
-                    case Pfim.ImageFormat.Rgba32:
-                        format = PixelFormat.Format32bppArgb;
-                        break;
-                    default:
-                        // see the sample for more details
-                        throw new NotImplementedException();
-                }
+                    PixelFormat format;
 
-                // Pin pfim's data array so that it doesn't get reaped by GC, unnecessary
-                // in this snippet but useful technique if the data was going to be used in
-                // control like a picture box
-                var handle = GCHandle.Alloc(image.Data, GCHandleType.Pinned);
-                try
-                {
-                    var data = Marshal.UnsafeAddrOfPinnedArrayElement(image.Data, 0);
-                    var bitmap = new Bitmap(image.Width, image.Height, image.Stride, format, data);
-                    // resize the bitmap before saving it
-                    var resized = new Bitmap(bitmap, new System.Drawing.Size(256, 256));
-                    resized.Save(outputPath, System.Drawing.Imaging.ImageFormat.Png);
-                }
-                finally
-                {
-                    handle.Free();
+                    // Convert from Pfim's backend agnostic image format into GDI+'s image format
+                    switch (image.Format)
+                    {
+                        case Pfim.ImageFormat.Rgba32:
+                            format = PixelFormat.Format32bppArgb;
+                            break;
+                        default:
+                            // see the sample for more details
+                            throw new NotImplementedException();
+                    }
+
+                    // Pin pfim's data array so that it doesn't get reaped by GC, unnecessary
+                    // in this snippet but useful technique if the data was going to be used in
+                    // control like a picture box
+                    var handle = GCHandle.Alloc(image.Data, GCHandleType.Pinned);
+                    try
+                    {
+                        var data = Marshal.UnsafeAddrOfPinnedArrayElement(image.Data, 0);
+                        var bitmap = new Bitmap(image.Width, image.Height, image.Stride, format, data);
+                        // resize the bitmap before saving it
+                        var resized = new Bitmap(bitmap, new System.Drawing.Size(256, 256));
+                        resized.Save(outputPath, System.Drawing.Imaging.ImageFormat.Png);
+                    }
+                    finally
+                    {
+                        handle.Free();
+                    }
                 }
+                return true;
             }
-            return true;
-        }
             catch (Exception ex)
             {
-              //Removed PaperTrailSystem Due to lack of reliability.
+                //Removed PaperTrailSystem Due to lack of reliability.
                 SnackBar.Appearance = ControlAppearance.Danger;
                 SnackBar.Title = "ERROR";
                 SnackBar.Message = ex.Message;
@@ -2694,12 +2694,12 @@ private bool DdsToPng(string imagePath, string outputPath)
 
             }
             return false;
-}
+        }
 
-// these dictionaries have to be hardcoded because skin tool just hardcodes in offsets afaik
+        // these dictionaries have to be hardcoded because skin tool just hardcodes in offsets afaik
 
-// weapons
-private readonly Dictionary<string, string> weaponNameToPath = new()
+        // weapons
+        private readonly Dictionary<string, string> weaponNameToPath = new()
         {
             // pilot weapons
             { "R201_Default", @"texture\\models\\weapons\\r101\\r101" },
@@ -2947,14 +2947,14 @@ await Task.Run(() =>
             {
                 if (X == true)
                 {
-                   
+
                     DispatchIfNecessary(async () =>
                     {
                         if (Icon_Bg.Source.ToString().Contains("advocate_announcement_1.png"))
                         {
                             return;
                         }
-                       
+
                         if (Icon_Bg.Opacity > 0)
                         {
                             DoubleAnimation da = new DoubleAnimation
@@ -2981,10 +2981,10 @@ await Task.Run(() =>
                         bitmap.BeginInit();
                         bitmap.UriSource = new Uri(@"pack://application:,,,/Resources/Icons/Main_UI/advocate_announcement_1.png");
                         bitmap.EndInit();
-                      
 
-                            Icon_Bg.Source = bitmap;
-                        
+
+                        Icon_Bg.Source = bitmap;
+
 
                         DoubleAnimation da = new DoubleAnimation
                         {
@@ -3004,15 +3004,15 @@ await Task.Run(() =>
                 }
                 else
                 {
-                   
+
                     DispatchIfNecessary(async () =>
                     {
                         if (Icon_Bg.Source.ToString().Contains("Tools-Silhouette-Transparent.png"))
                         {
                             return;
                         }
-                        
-                        if (Icon_Bg.Opacity > 0 )
+
+                        if (Icon_Bg.Opacity > 0)
                         {
                             DoubleAnimation da = new DoubleAnimation
                             {
@@ -3030,17 +3030,17 @@ await Task.Run(() =>
                     Thread.Sleep(420);
                     DispatchIfNecessary(async () =>
                     {
-                    if (Icon_Bg.Opacity == 0)
-                    {
-                        BitmapImage bitmap = new BitmapImage();
-                        bitmap.BeginInit();
-                        bitmap.UriSource = new Uri(@"pack://application:,,,/Resources/Icons/Main_UI/Tools-Silhouette-Transparent.png");
-                        bitmap.EndInit();
+                        if (Icon_Bg.Opacity == 0)
+                        {
+                            BitmapImage bitmap = new BitmapImage();
+                            bitmap.BeginInit();
+                            bitmap.UriSource = new Uri(@"pack://application:,,,/Resources/Icons/Main_UI/Tools-Silhouette-Transparent.png");
+                            bitmap.EndInit();
+
 
-                     
 
                             Icon_Bg.Source = bitmap;
-                     
+
 
                             DoubleAnimation da = new DoubleAnimation
                             {
@@ -3051,7 +3051,7 @@ await Task.Run(() =>
                             };
                             Icon_Bg.BeginAnimation(OpacityProperty, da);
 
-                    }
+                        }
                     });
 
 
@@ -3065,16 +3065,16 @@ private void Tabs_SelectionChanged(object sender, SelectionChangedEventArgs e)
             {
                 if (!Directory.Exists(Tools_Dir)) {
 
-                TryCreateDirectory(Tools_Dir);
-                if (!Directory.Exists(Tools_Dir))
-                {
-                    SnackBar.Icon = SymbolRegular.ErrorCircle20;
-                    SnackBar.Appearance = ControlAppearance.Danger; SnackBar.Title = "ERROR";
-                    SnackBar.Message = "Tools Directory Empty and could not be created!";
-                    SnackBar.Show();
-                }
+                    TryCreateDirectory(Tools_Dir);
+                    if (!Directory.Exists(Tools_Dir))
+                    {
+                        SnackBar.Icon = SymbolRegular.ErrorCircle20;
+                        SnackBar.Appearance = ControlAppearance.Danger; SnackBar.Title = "ERROR";
+                        SnackBar.Message = "Tools Directory Empty and could not be created!";
+                        SnackBar.Show();
+                    }
 
-            }
+                }
                 if (Tabs.SelectedItem.ToString() != null)
                 {
 
@@ -3092,7 +3092,7 @@ private void Tabs_SelectionChanged(object sender, SelectionChangedEventArgs e)
                             Properties.Settings.Default.REpak_Folder_Path = Tools_Dir + @"RePak\" + "RePak.exe"; ;
                             Properties.Settings.Default.Save();
                             Mod_Adv_Repak_Path = Tools_Dir + @"RePak\" + "RePak.exe";
-                            Zip_Box_Advocate_Copy.Text = Mod_Adv_Repak_Path;
+                            //Zip_Box_Advocate_Copy.Text = Mod_Adv_Repak_Path;
                         }
 
 
@@ -3147,7 +3147,7 @@ private void Locate_Zip_Advocate_Click(object sender, RoutedEventArgs e)
                             SnackBar.Title = "INFO";
                             SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Locate_Zip_Click_ValidZipFound;
                             SnackBar.Show();
-                            Zip_Box_Advocate.Text = Mod_Adv_Skin_Path;
+                            //Zip_Box_Advocate.Text = Mod_Adv_Skin_Path;
 
                         }
                     }
@@ -3156,179 +3156,178 @@ private void Locate_Zip_Advocate_Click(object sender, RoutedEventArgs e)
             }
             catch (Exception ex)
             {
-               Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
+                Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
 
             }
         }
 
-       
-      
-        private void Image_Icon_Advocate_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-
-            if (e.LeftButton == MouseButtonState.Pressed)
-            {
-                try
-                {
-                    OpenFileDialog openFileDialog = new OpenFileDialog();
-                    openFileDialog.Filter = "Png files (*.png)|*.png|All files (*.*)|*.*";
-                    openFileDialog.RestoreDirectory = true;
-                    if (openFileDialog.ShowDialog() == true)
-                    {
-                        Mod_Adv_Icon_Path = openFileDialog.FileName;
-                        if (!File.Exists(Mod_Adv_Icon_Path))
-                        {
 
-                            SnackBar.Icon = SymbolRegular.ErrorCircle20;
-                            SnackBar.Appearance = ControlAppearance.Danger; SnackBar.Title = "ERROR";
-                            SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Icon_Image_MouseDown_NotAValidPNGImage;
-                            SnackBar.Show();
-                            return;
 
-                        }
-                        else
-                        {
-                            if (Path.GetExtension(Mod_Adv_Icon_Path).Contains("png"))
-                            {
-                                int imgwidth;
-                                int imgheight;
-
-                                using (var image = SixLabors.ImageSharp.Image.Load(Mod_Adv_Icon_Path))
-                                {
-                                    imgwidth = image.Width;
-                                    imgheight = image.Height;
-                                }
-
-                                if (imgwidth == 256 && imgheight == 256)
-                                {
-
-                                    SnackBar.Appearance = ControlAppearance.Success;
-                                    SnackBar.Title = "SUCCESS";
-                                    SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Icon_Image_MouseDown_ValidImageFoundAt + Mod_Icon_Path;
-                                    SnackBar.Show();
-                                    BitmapImage Mod_Icon = new BitmapImage();
-                                    Mod_Icon.BeginInit();
+        private void Image_Icon_Advocate_MouseDown(object sender, MouseButtonEventArgs e)
+        {
 
-                                    Mod_Icon.UriSource = new Uri(Mod_Adv_Icon_Path);
-                                    Mod_Icon.EndInit();
+            //if (e.LeftButton == MouseButtonState.Pressed)
+            //{
+            //    try
+            //    {
+            //        OpenFileDialog openFileDialog = new OpenFileDialog();
+            //        openFileDialog.Filter = "Png files (*.png)|*.png|All files (*.*)|*.*";
+            //        openFileDialog.RestoreDirectory = true;
+            //        if (openFileDialog.ShowDialog() == true)
+            //        {
+            //            Mod_Adv_Icon_Path = openFileDialog.FileName;
+            //            if (!File.Exists(Mod_Adv_Icon_Path))
+            //            {
+
+            //                SnackBar.Icon = SymbolRegular.ErrorCircle20;
+            //                SnackBar.Appearance = ControlAppearance.Danger; SnackBar.Title = "ERROR";
+            //                SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Icon_Image_MouseDown_NotAValidPNGImage;
+            //                SnackBar.Show();
+            //                return;
+
+            //            }
+            //            else
+            //            {
+            //                if (Path.GetExtension(Mod_Adv_Icon_Path).Contains("png"))
+            //                {
+            //                    int imgwidth;
+            //                    int imgheight;
+
+            //                    using (var image = SixLabors.ImageSharp.Image.Load(Mod_Adv_Icon_Path))
+            //                    {
+            //                        imgwidth = image.Width;
+            //                        imgheight = image.Height;
+            //                    }
+
+            //                    if (imgwidth == 256 && imgheight == 256)
+            //                    {
+
+            //                        SnackBar.Appearance = ControlAppearance.Success;
+            //                        SnackBar.Title = "SUCCESS";
+            //                        SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Icon_Image_MouseDown_ValidImageFoundAt + Mod_Icon_Path;
+            //                        SnackBar.Show();
+            //                        BitmapImage Mod_Icon = new BitmapImage();
+            //                        Mod_Icon.BeginInit();
+
+            //                        Mod_Icon.UriSource = new Uri(Mod_Adv_Icon_Path);
+            //                        Mod_Icon.EndInit();
+
+            //                        Image_Icon_Advocate.Background = new ImageBrush(Mod_Icon);
+
+            //                    }
+            //                    else
+            //                    {
+            //                        SnackBar.Icon = SymbolRegular.ErrorCircle20;
+            //                        SnackBar.Appearance = ControlAppearance.Danger; SnackBar.Title = "ERROR";
+            //                        SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Icon_Image_MouseDown_InvalidImageSizeMustBe256x256;
+            //                        SnackBar.Show();
+
+            //                        return;
+
+            //                    }
+
+            //                }
+            //                else
+            //                {
+            //                    SnackBar.Icon = SymbolRegular.ErrorCircle20;
+            //                    SnackBar.Appearance = ControlAppearance.Danger; SnackBar.Title = "ERROR";
+            //                    SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Icon_Image_MouseDown_ThatWasNotAProperPNG;
+            //                    SnackBar.Show();
+
+            //                    return;
+            //                }
+            //            }
+            //        }
+
+            //    }
+            //    catch (Exception ex)
+            //    {
+            //       Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
+
+            //    }
+       // }
+    }
 
-                                    Image_Icon_Advocate.Background = new ImageBrush(Mod_Icon);
+    private void Image_Icon_Advocate_Drop(object sender, DragEventArgs e)
+    {
+        try
+        {
+            if (e.Data.GetDataPresent(DataFormats.FileDrop))
+            {
+                HandyControl.Controls.DashedBorder DashedBorder = (HandyControl.Controls.DashedBorder)sender;
+                Console.WriteLine(DashedBorder.Name);
 
-                                }
-                                else
-                                {
-                                    SnackBar.Icon = SymbolRegular.ErrorCircle20;
-                                    SnackBar.Appearance = ControlAppearance.Danger; SnackBar.Title = "ERROR";
-                                    SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Icon_Image_MouseDown_InvalidImageSizeMustBe256x256;
-                                    SnackBar.Show();
-                                   
-                                    return;
+                // Note that you can have more than one file.
+                string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
+                string map_Path = files.FirstOrDefault();
 
-                                }
 
-                            }
-                            else
-                            {
-                                SnackBar.Icon = SymbolRegular.ErrorCircle20;
-                                SnackBar.Appearance = ControlAppearance.Danger; SnackBar.Title = "ERROR";
-                                SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Icon_Image_MouseDown_ThatWasNotAProperPNG;
-                                SnackBar.Show();
-                             
-                                return;
-                            }
-                        }
-                    }
 
-                }
-                catch (Exception ex)
+                if (!File.Exists(map_Path))
                 {
-                   Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
+
+                    SnackBar.Icon = SymbolRegular.ErrorCircle20;
+                    SnackBar.Appearance = ControlAppearance.Danger; SnackBar.Title = "ERROR";
+                    SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Icon_Image_MouseDown_NotAValidPNGImage;
+                    SnackBar.Show();
+                    return;
 
                 }
-            }
-        }
-        
-        private void Image_Icon_Advocate_Drop(object sender, DragEventArgs e)
-        {
-            try
-            {
-                if (e.Data.GetDataPresent(DataFormats.FileDrop))
+                else
                 {
-                    HandyControl.Controls.DashedBorder DashedBorder = (HandyControl.Controls.DashedBorder)sender;
-                    Console.WriteLine(DashedBorder.Name);
-
-                    // Note that you can have more than one file.
-                    string[] files = (string[])e.Data.GetData(DataFormats.FileDrop);
-                    string map_Path = files.FirstOrDefault();
-
-
-
-                    if (!File.Exists(map_Path))
+                    if (Path.GetExtension(map_Path).Contains("png"))
                     {
+                        int imgwidth;
+                        int imgheight;
 
-                        SnackBar.Icon = SymbolRegular.ErrorCircle20;
-                        SnackBar.Appearance = ControlAppearance.Danger; SnackBar.Title = "ERROR";
-                        SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Icon_Image_MouseDown_NotAValidPNGImage;
-                        SnackBar.Show();
-                        return;
-
-                    }
-                    else
-                    {
-                        if (Path.GetExtension(map_Path).Contains("png"))
+                        using (var image = SixLabors.ImageSharp.Image.Load(map_Path))
                         {
-                            int imgwidth;
-                            int imgheight;
+                            imgwidth = image.Width;
+                            imgheight = image.Height;
+                        }
 
-                            using (var image = SixLabors.ImageSharp.Image.Load(map_Path))
-                            {
-                                imgwidth = image.Width;
-                                imgheight = image.Height;
-                            }
 
-                           
 
-                                if (imgwidth == 256 && imgheight == 256)
-                                {
+                        if (imgwidth == 256 && imgheight == 256)
+                        {
 
-                                    BitmapImage map_ = new BitmapImage();
-                                    map_.BeginInit();
+                            BitmapImage map_ = new BitmapImage();
+                            map_.BeginInit();
 
-                                    map_.UriSource = new Uri(map_Path);
-                                    map_.EndInit();
-                                   
-                                    DashedBorder.Background = new ImageBrush(map_);
-                                    Mod_Adv_Icon_Path = map_Path;
-                                }
-                                else
-                                {
-                                    SnackBar.Icon = SymbolRegular.ErrorCircle20;
-                                    SnackBar.Appearance = ControlAppearance.Danger; SnackBar.Title = "ERROR";
-                                    SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Icon_Image_MouseDown_InvalidImageSizeMustBe256x256;
-                                    SnackBar.Show();
-                                    DashedBorder.Background = new ImageBrush();
-                                    return;
+                            map_.UriSource = new Uri(map_Path);
+                            map_.EndInit();
+
+                            DashedBorder.Background = new ImageBrush(map_);
+                            Mod_Adv_Icon_Path = map_Path;
+                        }
+                        else
+                        {
+                            SnackBar.Icon = SymbolRegular.ErrorCircle20;
+                            SnackBar.Appearance = ControlAppearance.Danger; SnackBar.Title = "ERROR";
+                            SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Icon_Image_MouseDown_InvalidImageSizeMustBe256x256;
+                            SnackBar.Show();
+                            DashedBorder.Background = new ImageBrush();
+                            return;
 
-                                }
-                            
                         }
 
                     }
 
+                }
 
 
 
-                }
 
             }
-            catch (Exception ex)
-            {
-               Log.Error(ex, $"A crash happened at {DateTime.Now.ToString("yyyy - MM - dd HH - mm - ss.ff", CultureInfo.InvariantCulture)}{Environment.NewLine}");
 
-            }
+        }
+        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 Locate_Repak_Exe_Click(object sender, RoutedEventArgs e)
         {
             try
@@ -3363,7 +3362,7 @@ private void Locate_Repak_Exe_Click(object sender, RoutedEventArgs e)
                             SnackBar.Title = "INFO";
                             SnackBar.Message = VTOL.Resources.Languages.Language.Page_Tools_Locate_Repak_Exe_Click_ExeLocated;
                             SnackBar.Show();
-                            Zip_Box_Advocate_Copy.Text = Mod_Adv_Repak_Path;
+                            //Zip_Box_Advocate_Copy.Text = Mod_Adv_Repak_Path;
 
                         }
                     }
@@ -3397,8 +3396,8 @@ private void Output_Button_Advocate_Click(object sender, RoutedEventArgs e)
                 else
                 {
                     Mod_Adv_Output_Path = dialog.SelectedPath;
-                    Output_Box_Advocate.Text = Mod_Adv_Output_Path;
-                    Output_Box_Advocate.Background = Brushes.Transparent;
+                    //Output_Box_Advocate.Text = Mod_Adv_Output_Path;
+                    //Output_Box_Advocate.Background = Brushes.Transparent;
 
                 }
             }
@@ -3406,7 +3405,7 @@ private void Output_Button_Advocate_Click(object sender, RoutedEventArgs e)
 
         private void Save_Mod_Advocate_Click(object sender, RoutedEventArgs e)
         {
-            Convert();
+            //Convert();
         }
         async void Start_Exe(string path , string args = null)
         {
diff --git a/VTOL_2.0.0/Resources/Languages/Language.Designer.cs b/VTOL_2.0.0/Resources/Languages/Language.Designer.cs
index 529b2212..480ebeba 100644
--- a/VTOL_2.0.0/Resources/Languages/Language.Designer.cs
+++ b/VTOL_2.0.0/Resources/Languages/Language.Designer.cs
@@ -186,6 +186,24 @@ public static string MainWindow_Tools {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to MOD INFO.
+        /// </summary>
+        public static string MODINFO {
+            get {
+                return ResourceManager.GetString("MODINFO", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to MOD SIZE ON DISK.
+        /// </summary>
+        public static string MODSIZEONDISK {
+            get {
+                return ResourceManager.GetString("MODSIZEONDISK", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to ABOUT.
         /// </summary>
@@ -1703,6 +1721,15 @@ public static string Parse_Release_ReleaseNotFound {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to PATH.
+        /// </summary>
+        public static string PATH {
+            get {
+                return ResourceManager.GetString("PATH", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Please Wait as VTOL restarts!.
         /// </summary>
@@ -1721,6 +1748,15 @@ public static string Read_Latest_Release_InvalidReleaseDonwloadURL {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Requires - .
+        /// </summary>
+        public static string Requires {
+            get {
+                return ResourceManager.GetString("Requires", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Installation Complete!.
         /// </summary>
@@ -1747,5 +1783,14 @@ public static string Unpack_To_Location_WasNotFound {
                 return ResourceManager.GetString("Unpack_To_Location_WasNotFound", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to VERSION.
+        /// </summary>
+        public static string VERSION {
+            get {
+                return ResourceManager.GetString("VERSION", resourceCulture);
+            }
+        }
     }
 }
diff --git a/VTOL_2.0.0/Resources/Languages/Language.resx b/VTOL_2.0.0/Resources/Languages/Language.resx
index 2d1ca221..e1278d1f 100644
--- a/VTOL_2.0.0/Resources/Languages/Language.resx
+++ b/VTOL_2.0.0/Resources/Languages/Language.resx
@@ -678,4 +678,19 @@
   <data name="Page_Home_Install_NS_METHOD_GitHubRateLimitForDownloadTriesHasBeenExceededError403FromRemoteServerPleaseWait" xml:space="preserve">
     <value>GitHub Rate limit for Download tries has been exceeded. error 403 from remote server. Please wait</value>
   </data>
+  <data name="Requires" xml:space="preserve">
+    <value>Requires - </value>
+  </data>
+  <data name="MODSIZEONDISK" xml:space="preserve">
+    <value>MOD SIZE ON DISK</value>
+  </data>
+  <data name="VERSION" xml:space="preserve">
+    <value>VERSION</value>
+  </data>
+  <data name="PATH" xml:space="preserve">
+    <value>PATH</value>
+  </data>
+  <data name="MODINFO" xml:space="preserve">
+    <value>MOD INFO</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/VTOL_2.0.0/Scripts/Updater.cs b/VTOL_2.0.0/Scripts/Updater.cs
index 26e71cbf..548f64ea 100644
--- a/VTOL_2.0.0/Scripts/Updater.cs
+++ b/VTOL_2.0.0/Scripts/Updater.cs
@@ -174,7 +174,7 @@ public void GetRepository_Custom()
             Thunderstore = Thunderstore_V1.FromJson(json);
             repository = Repository.FromJson(json);
         }
-        public void Download_Cutom_JSON(bool _call_from_file = false)
+        public async Task Download_Cutom_JSON(bool _call_from_file = false)
         {
             try
             {
@@ -212,6 +212,13 @@ public void Download_Cutom_JSON(bool _call_from_file = false)
                     }
                     else
                     {
+
+                        //Uri URL = new Uri(address);
+
+                        //HttpClient client = new HttpClient();
+                        //HttpResponseMessage response = await client.GetAsync(URL);
+                        //response.EnsureSuccessStatusCode();
+                        //string json = await response.Content.ReadAsStringAsync();
                         Uri uri1 = new Uri(address);
                         using (var webClient = new System.Net.WebClient())
                         {
@@ -228,6 +235,12 @@ public void Download_Cutom_JSON(bool _call_from_file = false)
                 }
                 else
                 {
+                    //Uri URL = new Uri(address);
+
+                    //HttpClient client = new HttpClient();
+                    //HttpResponseMessage response = await client.GetAsync(URL);
+                    //response.EnsureSuccessStatusCode();
+                    //string json = await response.Content.ReadAsStringAsync();
                     Uri uri1 = new Uri(address);
                     using (var webClient = new System.Net.WebClient())
                     {
@@ -244,7 +257,7 @@ public void Download_Cutom_JSON(bool _call_from_file = false)
                     //    File.Delete(AppDataFolder + @"\VTOL_DATA\VARS\Thunderstore.json");
                     //}
                 }
-
+               
 
 
 
diff --git a/VTOL_2.0.0/UpgradeLog6.htm b/VTOL_2.0.0/UpgradeLog6.htm
new file mode 100644
index 00000000..d8deea92
Binary files /dev/null and b/VTOL_2.0.0/UpgradeLog6.htm differ
diff --git a/VTOL_2.0.0/VTOL.csproj b/VTOL_2.0.0/VTOL.csproj
index fcdc399b..6c59673f 100644
--- a/VTOL_2.0.0/VTOL.csproj
+++ b/VTOL_2.0.0/VTOL.csproj
@@ -20,9 +20,9 @@
 	  <RepositoryUrl>https://github.com/BigSpice/VTOL</RepositoryUrl>
 	  <RepositoryType>git</RepositoryType>
 	  <PackageTags>mod;installer;modmanager;northstar-client;titanfall2</PackageTags>
-	  <AssemblyVersion>3.0.0</AssemblyVersion>
-	  <FileVersion>3.0.0</FileVersion>
-	  <Version>3.0.0</Version>
+	  <AssemblyVersion>3.0.1</AssemblyVersion>
+	  <FileVersion>3.0.1</FileVersion>
+	  <Version>3.0.1</Version>
 	  <EnableNETAnalyzers>False</EnableNETAnalyzers>
 	  <ErrorReport>none</ErrorReport>
 
@@ -322,6 +322,7 @@
 
   <ItemGroup>
 	  <PackageReference Include="Magick.NET-Q16-x86" Version="12.2.1" />
+	  <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
 	  <PackageReference Include="Microsoft.NETCore.Targets" Version="5.0.0" PrivateAssets="all" />
     <PackageReference Include="Aspose.Zip" Version="23.2.0" />
     <PackageReference Include="BCnEncoder.Net" Version="2.1.0" />
diff --git a/[Titanfall2_Downloadable_Tools]/RePak/RePak/RePak.exe b/[Titanfall2_Downloadable_Tools]/RePak/RePak/RePak.exe
new file mode 100644
index 00000000..265b4ef7
Binary files /dev/null and b/[Titanfall2_Downloadable_Tools]/RePak/RePak/RePak.exe differ