From 501d216594e071c8e74e880fc993da7963a95811 Mon Sep 17 00:00:00 2001
From: iAmAsval <valentinbaudry64@gmail.com>
Date: Wed, 15 Dec 2021 21:46:39 +0100
Subject: [PATCH] I can already hear people being lost because of a label
 change

---
 FModel/MainWindow.xaml                        | 34 +++++++++----------
 FModel/ViewModels/BackupManagerViewModel.cs   |  2 +-
 FModel/ViewModels/CUE4ParseViewModel.cs       | 11 ++----
 FModel/ViewModels/Commands/LoadCommand.cs     |  6 ++--
 FModel/ViewModels/ModelViewerViewModel.cs     |  1 -
 FModel/Views/About.xaml                       |  2 +-
 FModel/Views/AesManager.xaml                  | 14 ++++----
 FModel/Views/BackupManager.xaml               | 10 +++---
 FModel/Views/DirectorySelector.xaml           |  6 ++--
 .../FolderToSeparatorTagConverter.cs          |  4 +--
 FModel/Views/Resources/Resources.xaml         | 10 +++---
 FModel/Views/SearchView.xaml                  | 18 +++++-----
 FModel/Views/SettingsView.xaml                | 16 ++++-----
 13 files changed, 64 insertions(+), 70 deletions(-)

diff --git a/FModel/MainWindow.xaml b/FModel/MainWindow.xaml
index 12a9ad50..fa5b7b35 100644
--- a/FModel/MainWindow.xaml
+++ b/FModel/MainWindow.xaml
@@ -74,7 +74,7 @@
                     </MenuItem.Icon>
                 </MenuItem>
             </MenuItem>
-            <MenuItem Header="Assets">
+            <MenuItem Header="Packages">
                 <MenuItem Header="Search" IsEnabled="{Binding IsReady}" InputGestureText="Ctrl+Shift+F" Click="OnSearchViewClick">
                     <MenuItem.Icon>
                         <Viewbox Width="16" Height="16">
@@ -257,7 +257,7 @@
             <GroupBox Grid.Column="0" adonisExtensions:LayerExtension.Layer="2"
                       Padding="{adonisUi:Space 0}" Background="Transparent">
                 <TabControl x:Name="LeftTabControl" SelectionChanged="OnTabItemChange">
-                    <TabItem Style="{StaticResource TabItemFillSpace}" Header="Directory">
+                    <TabItem Style="{StaticResource TabItemFillSpace}" Header="Archives">
                         <DockPanel>
                             <Grid DockPanel.Dock="Top">
                                 <Grid.RowDefinitions>
@@ -292,7 +292,7 @@
                                     <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
 
-                                <Separator Grid.Row="0" Style="{StaticResource CustomSeparator}" Tag="GAME DIRECTORY" />
+                                <Separator Grid.Row="0" Style="{StaticResource CustomSeparator}" Tag="GAME ARCHIVES" />
                                 <ListBox Grid.Row="1" x:Name="DirectoryFilesListBox" Style="{StaticResource DirectoryFilesListBox}" MouseDoubleClick="OnMouseDoubleClick" />
                                 <Separator Grid.Row="2" Style="{StaticResource CustomSeparator}" Tag="INFORMATION" />
                                 <StackPanel Grid.Row="3" Orientation="Vertical" Margin="0 0 0 5">
@@ -343,7 +343,7 @@
                                            Width="16" Height="16" HorizontalAlignment="Center" Margin="0 0 3.5 0" />
                                     <TextBlock HorizontalAlignment="Left" VerticalAlignment="Center" TextTrimming="CharacterEllipsis">
                                         <TextBlock.Text>
-                                            <MultiBinding StringFormat="{}'{0}' has {1} folders and {2} files">
+                                            <MultiBinding StringFormat="{}'{0}' has {1} folders and {2} packages">
                                                 <Binding Path="SelectedItem.Header" ElementName="AssetsFolderName" FallbackValue="None" />
                                                 <Binding Path="SelectedItem.FoldersView.Count" ElementName="AssetsFolderName" FallbackValue="0" />
                                                 <Binding Path="SelectedItem.AssetsList.Assets.Count" ElementName="AssetsFolderName" FallbackValue="0" />
@@ -382,7 +382,7 @@
                             <TreeView Grid.Row="2" x:Name="AssetsFolderName" Style="{StaticResource AssetsFolderTreeView}" PreviewMouseDoubleClick="OnAssetsTreeMouseDoubleClick">
                                 <TreeView.ContextMenu>
                                     <ContextMenu>
-                                        <MenuItem Header="Extract Folder's Assets" Click="OnFolderExtractClick">
+                                        <MenuItem Header="Extract Folder's Packages" Click="OnFolderExtractClick">
                                             <MenuItem.Icon>
                                                 <Viewbox Width="16" Height="16">
                                                     <Canvas Width="24" Height="24">
@@ -391,7 +391,7 @@
                                                 </Viewbox>
                                             </MenuItem.Icon>
                                         </MenuItem>
-                                        <MenuItem Header="Export Folder's Assets Raw Data" Click="OnFolderExportClick">
+                                        <MenuItem Header="Export Folder's Packages Raw Data" Click="OnFolderExportClick">
                                             <MenuItem.Icon>
                                                 <Viewbox Width="16" Height="16">
                                                     <Canvas Width="24" Height="24">
@@ -400,7 +400,7 @@
                                                 </Viewbox>
                                             </MenuItem.Icon>
                                         </MenuItem>
-                                        <MenuItem Header="Save Folder's Assets Properties" Click="OnFolderSaveClick">
+                                        <MenuItem Header="Save Folder's Packages Properties" Click="OnFolderSaveClick">
                                             <MenuItem.Icon>
                                                 <Viewbox Width="16" Height="16">
                                                     <Canvas Width="24" Height="24">
@@ -447,22 +447,22 @@
                                     </Grid.ColumnDefinitions>
 
                                     <TextBlock Grid.Row="0" Grid.Column="0" Text="{Binding SelectedItem.AssetsList.Assets.Count, ElementName=AssetsFolderName, FallbackValue=0}" VerticalAlignment="Center" HorizontalAlignment="Left" />
-                                    <TextBlock Grid.Row="0" Grid.Column="1" Text="Assets Count" VerticalAlignment="Center" HorizontalAlignment="Right" />
+                                    <TextBlock Grid.Row="0" Grid.Column="1" Text="Packages Count" VerticalAlignment="Center" HorizontalAlignment="Right" />
                                     <TextBlock Grid.Row="1" Grid.Column="0" Text="{Binding SelectedItem.FoldersView.Count, ElementName=AssetsFolderName, FallbackValue=0}" VerticalAlignment="Center" HorizontalAlignment="Left" />
                                     <TextBlock Grid.Row="1" Grid.Column="1" Text="Folders Count" VerticalAlignment="Center" HorizontalAlignment="Right" />
                                     <TextBlock Grid.Row="2" Grid.Column="0" Text="{Binding SelectedItem.Package, ElementName=AssetsFolderName, FallbackValue='None'}" VerticalAlignment="Center" HorizontalAlignment="Left" />
-                                    <TextBlock Grid.Row="2" Grid.Column="1" Text="Included In Package" VerticalAlignment="Center" HorizontalAlignment="Right" />
+                                    <TextBlock Grid.Row="2" Grid.Column="1" Text="Included In Archive" VerticalAlignment="Center" HorizontalAlignment="Right" />
                                     <TextBlock Grid.Row="3" Grid.Column="0" Text="{Binding SelectedItem.MountPoint, ElementName=AssetsFolderName, FallbackValue='/', Converter={x:Static converters:TrimRightToLeftConverter.Instance}, ConverterParameter=275}" VerticalAlignment="Center" HorizontalAlignment="Left" />
-                                    <TextBlock Grid.Row="3" Grid.Column="1" Text="Package Mount Point" VerticalAlignment="Center" HorizontalAlignment="Right" />
+                                    <TextBlock Grid.Row="3" Grid.Column="1" Text="Archive Mount Point" VerticalAlignment="Center" HorizontalAlignment="Right" />
                                     <TextBlock Grid.Row="4" Grid.Column="0" Text="{Binding SelectedItem.Version, ElementName=AssetsFolderName, FallbackValue='VER_UE4_LATEST', Converter={x:Static converters:TrimRightToLeftConverter.Instance}, ConverterParameter=275}" VerticalAlignment="Center" HorizontalAlignment="Left" />
-                                    <TextBlock Grid.Row="4" Grid.Column="1" Text="Package Version" VerticalAlignment="Center" HorizontalAlignment="Right" />
+                                    <TextBlock Grid.Row="4" Grid.Column="1" Text="Archive Version" VerticalAlignment="Center" HorizontalAlignment="Right" />
                                 </Grid>
                             </StackPanel>
                         </Grid>
                     </TabItem>
                     <TabItem Style="{StaticResource TabItemFillSpace}"
                              Header="{Binding SelectedItem.AssetsList.Assets.Count, FallbackValue=0, ElementName=AssetsFolderName}"
-                             HeaderStringFormat="{}{0} Assets">
+                             HeaderStringFormat="{}{0} Packages">
                         <DockPanel>
                             <Grid DockPanel.Dock="Top" ZIndex="0">
                                 <Grid.ColumnDefinitions>
@@ -573,7 +573,7 @@
                                                         </Canvas>
                                                     </Viewbox>
                                                 </MenuItem.Icon>
-                                                <MenuItem Header="File Path" Command="{Binding DataContext.CopyCommand}">
+                                                <MenuItem Header="Package Path" Command="{Binding DataContext.CopyCommand}">
                                                     <MenuItem.CommandParameter>
                                                         <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
                                                             <Binding Source="File_Path" />
@@ -581,7 +581,7 @@
                                                         </MultiBinding>
                                                     </MenuItem.CommandParameter>
                                                 </MenuItem>
-                                                <MenuItem Header="File Name" Command="{Binding DataContext.CopyCommand}">
+                                                <MenuItem Header="Package Name" Command="{Binding DataContext.CopyCommand}">
                                                     <MenuItem.CommandParameter>
                                                         <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
                                                             <Binding Source="File_Name" />
@@ -597,7 +597,7 @@
                                                         </MultiBinding>
                                                     </MenuItem.CommandParameter>
                                                 </MenuItem>
-                                                <MenuItem Header="File Path w/o Extension" Command="{Binding DataContext.CopyCommand}">
+                                                <MenuItem Header="Package Path w/o Extension" Command="{Binding DataContext.CopyCommand}">
                                                     <MenuItem.CommandParameter>
                                                         <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
                                                             <Binding Source="File_Path_No_Extension" />
@@ -605,7 +605,7 @@
                                                         </MultiBinding>
                                                     </MenuItem.CommandParameter>
                                                 </MenuItem>
-                                                <MenuItem Header="File Name w/o Extension" Command="{Binding DataContext.CopyCommand}">
+                                                <MenuItem Header="Package Name w/o Extension" Command="{Binding DataContext.CopyCommand}">
                                                     <MenuItem.CommandParameter>
                                                         <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
                                                             <Binding Source="File_Name_No_Extension" />
@@ -641,7 +641,7 @@
                                         <TextBlock Grid.Row="3" Grid.Column="0" Text="{Binding SelectedItem.IsEncrypted, ElementName=AssetsListName, FallbackValue='False'}" VerticalAlignment="Center" HorizontalAlignment="Left" />
                                         <TextBlock Grid.Row="3" Grid.Column="1" Text="Is Encrypted" VerticalAlignment="Center" HorizontalAlignment="Right" />
                                         <TextBlock Grid.Row="4" Grid.Column="0" Text="{Binding SelectedItem.Package, ElementName=AssetsListName, FallbackValue='None'}" VerticalAlignment="Center" HorizontalAlignment="Left" />
-                                        <TextBlock Grid.Row="4" Grid.Column="1" Text="Included In Package" VerticalAlignment="Center" HorizontalAlignment="Right" />
+                                        <TextBlock Grid.Row="4" Grid.Column="1" Text="Included In Archive" VerticalAlignment="Center" HorizontalAlignment="Right" />
                                     </Grid>
                                 </StackPanel>
                             </Grid>
diff --git a/FModel/ViewModels/BackupManagerViewModel.cs b/FModel/ViewModels/BackupManagerViewModel.cs
index 4ac46aec..b7951379 100644
--- a/FModel/ViewModels/BackupManagerViewModel.cs
+++ b/FModel/ViewModels/BackupManagerViewModel.cs
@@ -62,7 +62,7 @@ namespace FModel.ViewModels
             await _threadWorkerView.Begin(_ =>
             {
                 var backupFolder = Path.Combine(UserSettings.Default.OutputDirectory, "Backups");
-                var fileName = $"{_gameName}_{DateTime.Now.ToString("MM'-'dd'-'yyyy")}.fbkp";
+                var fileName = $"{_gameName}_{DateTime.Now:MM'_'dd'_'yyyy}.fbkp";
                 var fullPath = Path.Combine(backupFolder, fileName);
 
                 using var fileStream = new FileStream(fullPath, FileMode.Create);
diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs
index 13f296f4..5c56b30b 100644
--- a/FModel/ViewModels/CUE4ParseViewModel.cs
+++ b/FModel/ViewModels/CUE4ParseViewModel.cs
@@ -372,9 +372,7 @@ namespace FModel.ViewModels
         /// <remarks>Functions only when LoadLocalizedResources is used prior to this (Asval: Why?).</remarks>
         private async Task LoadHotfixedLocalizedResources()
         {
-            if (Game != FGame.FortniteGame) return;
-
-            if (HotfixedResourcesDone) return;
+            if (Game != FGame.FortniteGame || HotfixedResourcesDone) return;
             await _threadWorkerView.Begin(cancellationToken =>
             {
                 var hotfixes = ApplicationService.ApiEndpointView.BenbotApi.GetHotfixes(cancellationToken, Provider.GetLanguageCode(UserSettings.Default.AssetLanguage));
@@ -610,13 +608,10 @@ namespace FModel.ViewModels
                     break;
                 }
                 case "ufont":
-                    FLogger.AppendWarning();
-                    FLogger.AppendText($"Export '{fileName}' and change its extension if you want it to be an installable font file", Constants.WHITE, true);
-                    break;
                 case "otf":
                 case "ttf":
                     FLogger.AppendWarning();
-                    FLogger.AppendText($"Export '{fileName}' if you want it to be an installable font file", Constants.WHITE, true);
+                    FLogger.AppendText($"Export '{fileName}' raw data and change its extension if you want it to be an installable font file", Constants.WHITE, true);
                     break;
                 case "ushaderbytecode":
                 case "ushadercode":
@@ -632,7 +627,7 @@ namespace FModel.ViewModels
                 default:
                 {
                     FLogger.AppendWarning();
-                    FLogger.AppendText($"The file '{fileName}' is of an unknown type.", Constants.WHITE, true);
+                    FLogger.AppendText($"The package '{fileName}' is of an unknown type.", Constants.WHITE, true);
                     break;
                 }
             }
diff --git a/FModel/ViewModels/Commands/LoadCommand.cs b/FModel/ViewModels/Commands/LoadCommand.cs
index 6577c37e..c9c85f3b 100644
--- a/FModel/ViewModels/Commands/LoadCommand.cs
+++ b/FModel/ViewModels/Commands/LoadCommand.cs
@@ -42,7 +42,7 @@ namespace FModel.ViewModels.Commands
             if (_applicationView.CUE4Parse.Provider.Files.Count <= 0)
             {
                 FLogger.AppendError();
-                FLogger.AppendText("An encrypted file has been found. In order to decrypt it, please specify a working AES encryption key", Constants.WHITE, true);
+                FLogger.AppendText("An encrypted archive has been found. In order to decrypt it, please specify a working AES encryption key", Constants.WHITE, true);
                 return;
             }
 
@@ -50,7 +50,7 @@ namespace FModel.ViewModels.Commands
                 _applicationView.CUE4Parse.Provider.MappingsContainer == null)
             {
                 FLogger.AppendError();
-                FLogger.AppendText("Mappings could not get pulled, extracting assets might not work properly. If so, press F12 or please restart.", Constants.WHITE, true);
+                FLogger.AppendText("Mappings could not get pulled, extracting packages might not work properly. If so, press F12 or please restart.", Constants.WHITE, true);
             }
 
 #if DEBUG
@@ -154,7 +154,7 @@ namespace FModel.ViewModels.Commands
             if (!(bool) openFileDialog.ShowDialog()) return;
 
             FLogger.AppendInformation();
-            FLogger.AppendText($"Backup file older than current game version is '{openFileDialog.FileName.SubstringAfterLast("\\")}'", Constants.WHITE, true);
+            FLogger.AppendText($"Backup file older than current game is '{openFileDialog.FileName.SubstringAfterLast("\\")}'", Constants.WHITE, true);
 
             await using var fileStream = new FileStream(openFileDialog.FileName, FileMode.Open);
             await using var memoryStream = new MemoryStream();
diff --git a/FModel/ViewModels/ModelViewerViewModel.cs b/FModel/ViewModels/ModelViewerViewModel.cs
index a6c22558..544c53d3 100644
--- a/FModel/ViewModels/ModelViewerViewModel.cs
+++ b/FModel/ViewModels/ModelViewerViewModel.cs
@@ -16,7 +16,6 @@ using CUE4Parse.UE4.Assets.Exports.SkeletalMesh;
 using CUE4Parse.UE4.Assets.Exports.StaticMesh;
 using CUE4Parse.UE4.Assets.Exports.Texture;
 using CUE4Parse.UE4.Objects.Core.Math;
-using CUE4Parse.UE4.Objects.UObject;
 using CUE4Parse.Utils;
 using CUE4Parse_Conversion.Materials;
 using CUE4Parse_Conversion.Meshes;
diff --git a/FModel/Views/About.xaml b/FModel/Views/About.xaml
index 962be258..1b93d5e3 100644
--- a/FModel/Views/About.xaml
+++ b/FModel/Views/About.xaml
@@ -28,7 +28,7 @@
             <TextBlock Text="&#09;&#09;&#09;&#09;" FontSize="25" FontWeight="700" Height="2" Foreground="Transparent" HorizontalAlignment="Center" />
         </StackPanel>
         <TextBlock FontSize="12" Foreground="#727272" TextWrapping="Wrap" Margin="0 0 0 30"
-                   Text="Since the release in March 2019, we've continuously added new features and improved old ones. It started as a simple UE4 file explorer to parse assets and, as things progressed, became really popular to datamine games and create items icons. FModel 4 is now the most complete and well-made version so far. It features dozens of settings for you to use to make FModel your own." />
+                   Text="Since the release in March 2019, we've continuously added new features and improved old ones. It started as a simple UE4 file explorer to parse packages and, as things progressed, became really popular to data-mine games and create items icons. FModel 4 is now the most complete and well-made version so far. It features dozens of settings for you to use to make FModel your own." />
 
         <StackPanel HorizontalAlignment="Center">
             <TextBlock Text="Contributors" FontSize="15" FontWeight="700" Foreground="#9DA3DD" FontStretch="Expanded" />
diff --git a/FModel/Views/AesManager.xaml b/FModel/Views/AesManager.xaml
index 07c45823..8b5e8429 100644
--- a/FModel/Views/AesManager.xaml
+++ b/FModel/Views/AesManager.xaml
@@ -27,13 +27,13 @@
             <RowDefinition Height="Auto"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        
+
         <StackPanel Grid.Row="0" Orientation="Vertical" Margin="10 5 10 10">
             <TextBlock Text="What to do?" HorizontalAlignment="Center" FontSize="20" FontWeight="SemiBold" />
             <TextBlock TextAlignment="Center" TextWrapping="Wrap" HorizontalAlignment="Center" MaxWidth="576"
-                       Text="In order to decipher files' information, an AES key, in most cases, is needed. Here you can set the key for your static and dynamic files. If you don't know what key to use for your set game, simply Google it. Keys must start with &quot;0x&quot; and contains 64 more characters." />
+                       Text="In order to decipher archives' information, an AES key, in most cases, is needed. Here you can set the key for your static and dynamic archives. If you don't know what key to use for your set game, simply Google it. Keys must start with &quot;0x&quot; and contains 64 more characters." />
         </StackPanel>
-        
+
         <GroupBox Grid.Row="1" adonisExtensions:LayerExtension.Layer="2" Margin="10 10 10 18"
                   Padding="{adonisUi:Space 0}" Background="Transparent">
             <Grid>
@@ -41,7 +41,7 @@
                     <ColumnDefinition SharedSizeGroup="Name" Width="Auto" />
                     <ColumnDefinition SharedSizeGroup="Key" Width="*" />
                 </Grid.ColumnDefinitions>
-            
+
                 <ScrollViewer MaxHeight="350"
                               adonisExtensions:ScrollViewerExtension.VerticalScrollBarExpansionMode="NeverExpand"
                               adonisExtensions:ScrollViewerExtension.VerticalScrollBarPlacement="Docked">
@@ -54,7 +54,7 @@
                                         <ColumnDefinition Width="10" />
                                         <ColumnDefinition SharedSizeGroup="Key" />
                                     </Grid.ColumnDefinitions>
-                        
+
                                     <TextBlock Grid.Column="0" VerticalAlignment="Center" HorizontalAlignment="Right"
                                                Text="{Binding Name, UpdateSourceTrigger=PropertyChanged}" />
                                     <TextBox Grid.Column="2" HorizontalContentAlignment="Left" HorizontalAlignment="Stretch"
@@ -66,7 +66,7 @@
                 </ScrollViewer>
             </Grid>
         </GroupBox>
-        
+
         <Border Grid.Row="2"
                 Background="{DynamicResource {x:Static adonisUi:Brushes.Layer1BackgroundBrush}}"
                 adonisExtensions:LayerExtension.IncreaseLayer="True">
@@ -76,7 +76,7 @@
                     <ColumnDefinition Width="Auto"/>
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
-                
+
                 <Button Grid.Column="1" MinWidth="78" Margin="0 0 12 0" IsDefault="True" IsCancel="False"
                         HorizontalAlignment="Right" VerticalAlignment="Bottom" Content="OK" Click="OnClick" />
                 <Button Grid.Column="2" MinWidth="78" Margin="0 0 12 0" IsDefault="False"  IsCancel="False"
diff --git a/FModel/Views/BackupManager.xaml b/FModel/Views/BackupManager.xaml
index 8c3af476..3bce6185 100644
--- a/FModel/Views/BackupManager.xaml
+++ b/FModel/Views/BackupManager.xaml
@@ -34,15 +34,15 @@
             <ColumnDefinition Width="10" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        
+
         <TextBlock Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3" TextAlignment="Center" TextWrapping="Wrap" HorizontalAlignment="Center" VerticalAlignment="Center"
-                   Text="Because it looks like it's pretty hard to understand, you don't load backups, you load your files and compare them with the backup. Also, by clicking the download button you don't create your own backup you download a pre-made one. Kinda crazy we have to explain this, who will even read anyway..." />
-        
+                   Text="You can only use backup files when loading new &amp; modified archives. FModel will compare your local archives with the backup file you selected to filter packages and only show what you asked. We provide pre-created backups for some popular games but you can still create your own that will store information about all the game's packages at time T, for later use." />
+
         <Button Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3" Click="OnCreateBackupClick"
                 Style="{DynamicResource {x:Static adonisUi:Styles.AccentButton}}" Content="Create" />
-        
+
         <Separator Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="3" Style="{StaticResource CustomSeparator}" Tag="PRE-CREATED BACKUP FILES" />
-        
+
         <TextBlock Grid.Row="4" Grid.Column="0" VerticalAlignment="Center"
                    Text="{Binding SelectedBackup.FileSize, Converter={x:Static converters:SizeToStringConverter.Instance}, FallbackValue='Backup', StringFormat={}Backup ({0})}" />
         <ComboBox Grid.Row="4" Grid.Column="2" ItemsSource="{Binding BackupsView}" SelectedItem="{Binding SelectedBackup, Mode=TwoWay}">
diff --git a/FModel/Views/DirectorySelector.xaml b/FModel/Views/DirectorySelector.xaml
index ca4b0b55..933006ae 100644
--- a/FModel/Views/DirectorySelector.xaml
+++ b/FModel/Views/DirectorySelector.xaml
@@ -30,9 +30,9 @@
         <StackPanel Grid.Row="0" Orientation="Vertical" Margin="10 5 10 10">
             <TextBlock Text="What to do?" HorizontalAlignment="Center" FontSize="20" FontWeight="SemiBold" />
             <TextBlock TextAlignment="Center" TextWrapping="Wrap" HorizontalAlignment="Center"
-                       Text="We like to make things as simple as possible. Choose between the detected games or manually select your own directory. FModel will use this information to automatically find files to load and decrypt if needed. Make sure to not skip this step!" />
+                       Text="We like to make things as simple as possible. Choose between the detected games or manually select your own directory. FModel will use this information to automatically find archives to load and decrypt if needed. Make sure to not skip this step!" />
         </StackPanel>
-        
+
         <GroupBox Grid.Row="1" adonisExtensions:LayerExtension.Layer="2" Margin="10 10 10 18"
                   Padding="{adonisUi:Space 0}" Background="Transparent">
             <StackPanel>
@@ -59,7 +59,7 @@
                         <ColumnDefinition Width="5" />
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    
+
                     <TextBox Grid.Column="0" Text="{Binding SelectedDetectedGame.GameDirectory, Mode=TwoWay}" />
                     <Button Grid.Column="2" Content="..." HorizontalAlignment="Right" Click="OnBrowseDirectories" />
                 </Grid>
diff --git a/FModel/Views/Resources/Converters/FolderToSeparatorTagConverter.cs b/FModel/Views/Resources/Converters/FolderToSeparatorTagConverter.cs
index 3e0f85b2..d36f66d3 100644
--- a/FModel/Views/Resources/Converters/FolderToSeparatorTagConverter.cs
+++ b/FModel/Views/Resources/Converters/FolderToSeparatorTagConverter.cs
@@ -10,7 +10,7 @@ namespace FModel.Views.Resources.Converters
 
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return value != null ? $"{value.ToString()?.ToUpper()} ASSETS" : null;
+            return value != null ? $"{value.ToString()?.ToUpper()} PACKAGES" : null;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -18,4 +18,4 @@ namespace FModel.Views.Resources.Converters
             throw new NotImplementedException();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/FModel/Views/Resources/Resources.xaml b/FModel/Views/Resources/Resources.xaml
index 46afe381..f2f6950c 100644
--- a/FModel/Views/Resources/Resources.xaml
+++ b/FModel/Views/Resources/Resources.xaml
@@ -179,7 +179,7 @@
                     <Setter.Value>
                         <ControlTemplate>
                             <Grid>
-                                <TextBlock Text="No files found in given directory yet" FontWeight="SemiBold" TextAlignment="Center"
+                                <TextBlock Text="No archives found in given directory yet" FontWeight="SemiBold" TextAlignment="Center"
                                            Foreground="{DynamicResource {x:Static adonisUi:Brushes.ErrorBrush}}" />
                             </Grid>
                         </ControlTemplate>
@@ -240,7 +240,7 @@
                     <Setter.Value>
                         <ControlTemplate>
                             <Grid>
-                                <TextBlock Text="No audio to play yet" FontWeight="SemiBold" TextAlignment="Center"
+                                <TextBlock Text="No audio to play at the moment" FontWeight="SemiBold" TextAlignment="Center"
                                            Foreground="{DynamicResource {x:Static adonisUi:Brushes.ErrorBrush}}" />
                             </Grid>
                         </ControlTemplate>
@@ -273,7 +273,7 @@
                                 <ToolTip>
                                     <TextBlock>
                                         <TextBlock.Text>
-                                            <MultiBinding StringFormat="{}{0} has {1} folders and {2} files">
+                                            <MultiBinding StringFormat="{}{0} has {1} folders and {2} packages">
                                                 <Binding Path="Header" />
                                                 <Binding Path="FoldersView.Count" />
                                                 <Binding Path="AssetsList.Assets.Count" />
@@ -547,7 +547,7 @@
                     <Setter.Value>
                         <ControlTemplate>
                             <Grid>
-                                <TextBlock Text="No folder found in packages, make sure you loaded one" FontWeight="SemiBold" TextAlignment="Center"
+                                <TextBlock Text="No folder found in archives, make sure you loaded at least one" FontWeight="SemiBold" TextAlignment="Center"
                                            Foreground="{DynamicResource {x:Static adonisUi:Brushes.ErrorBrush}}" />
                             </Grid>
                         </ControlTemplate>
@@ -608,7 +608,7 @@
                     <Setter.Value>
                         <ControlTemplate>
                             <Grid>
-                                <TextBlock Text="No asset found in folder" FontWeight="SemiBold" TextAlignment="Center"
+                                <TextBlock Text="No package found in folder" FontWeight="SemiBold" TextAlignment="Center"
                                            Foreground="{DynamicResource {x:Static adonisUi:Brushes.ErrorBrush}}" />
                             </Grid>
                         </ControlTemplate>
diff --git a/FModel/Views/SearchView.xaml b/FModel/Views/SearchView.xaml
index a843e633..c4361457 100644
--- a/FModel/Views/SearchView.xaml
+++ b/FModel/Views/SearchView.xaml
@@ -28,14 +28,14 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="*" />
                 </Grid.RowDefinitions>
-                
+
                 <Grid Grid.Row="0" Margin="0 0 0 5" ZIndex="0">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
-                    
+
                     <Grid Grid.Column="0" ZIndex="1" HorizontalAlignment="Left" Margin="5 2 0 0">
                         <Viewbox Width="16" Height="16">
                             <Canvas Width="24" Height="24">
@@ -80,10 +80,10 @@
                             </Viewbox>
                         </Button>
                     </StackPanel>
-                    <TextBlock Grid.Column="2" Text="{Binding CUE4Parse.SearchVm.ResultsCount, FallbackValue=0, StringFormat={}{0:### ### ###} Loaded Assets}"
+                    <TextBlock Grid.Column="2" Text="{Binding CUE4Parse.SearchVm.ResultsCount, FallbackValue=0, StringFormat={}{0:### ### ###} Loaded Packages}"
                                VerticalAlignment="Center" HorizontalAlignment="Right" FontStyle="Italic"/>
                 </Grid>
-                
+
                 <ListView Grid.Row="1" x:Name="SearchListView" VirtualizingPanel.IsVirtualizing="True" ItemsSource="{Binding CUE4Parse.SearchVm.SearchResultsView, IsAsync=True}">
                     <ListView.Resources>
                         <Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource {x:Type ListViewItem}}">
@@ -124,7 +124,7 @@
                                         <Setter.Value>
                                             <ControlTemplate>
                                                 <Grid>
-                                                    <TextBlock Text="No folder found in packages, make sure you loaded one" FontWeight="SemiBold" TextAlignment="Center"
+                                                    <TextBlock Text="No folder found in archives, make sure you loaded at least one" FontWeight="SemiBold" TextAlignment="Center"
                                                                Foreground="{DynamicResource {x:Static adonisUi:Brushes.ErrorBrush}}" Margin="0 10 0 0" />
                                                 </Grid>
                                             </ControlTemplate>
@@ -154,7 +154,7 @@
                                         </Canvas>
                                     </Viewbox>
                                 </MenuItem.Icon>
-                                <MenuItem Header="File Path" Command="{Binding DataContext.CopyCommand}">
+                                <MenuItem Header="Package Path" Command="{Binding DataContext.CopyCommand}">
                                     <MenuItem.CommandParameter>
                                         <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
                                             <Binding Source="File_Path" />
@@ -162,7 +162,7 @@
                                         </MultiBinding>
                                     </MenuItem.CommandParameter>
                                 </MenuItem>
-                                <MenuItem Header="File Name" Command="{Binding DataContext.CopyCommand}">
+                                <MenuItem Header="Package Name" Command="{Binding DataContext.CopyCommand}">
                                     <MenuItem.CommandParameter>
                                         <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
                                             <Binding Source="File_Name" />
@@ -178,7 +178,7 @@
                                         </MultiBinding>
                                     </MenuItem.CommandParameter>
                                 </MenuItem>
-                                <MenuItem Header="File Path w/o Extension" Command="{Binding DataContext.CopyCommand}">
+                                <MenuItem Header="Package Path w/o Extension" Command="{Binding DataContext.CopyCommand}">
                                     <MenuItem.CommandParameter>
                                         <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
                                             <Binding Source="File_Path_No_Extension" />
@@ -186,7 +186,7 @@
                                         </MultiBinding>
                                     </MenuItem.CommandParameter>
                                 </MenuItem>
-                                <MenuItem Header="File Name w/o Extension" Command="{Binding DataContext.CopyCommand}">
+                                <MenuItem Header="Package Name w/o Extension" Command="{Binding DataContext.CopyCommand}">
                                     <MenuItem.CommandParameter>
                                         <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
                                             <Binding Source="File_Name_No_Extension" />
diff --git a/FModel/Views/SettingsView.xaml b/FModel/Views/SettingsView.xaml
index 5d14eb0e..c9ef4b2d 100644
--- a/FModel/Views/SettingsView.xaml
+++ b/FModel/Views/SettingsView.xaml
@@ -66,7 +66,7 @@
                         </ComboBox.ItemTemplate>
                     </ComboBox>
 
-                    <TextBlock Grid.Row="3" Grid.Column="0" Text="Assets Language" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="Language used and shown when parsing assets" />
+                    <TextBlock Grid.Row="3" Grid.Column="0" Text="Packages Language" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="Language used and shown when parsing packages" />
                     <ComboBox Grid.Row="3" Grid.Column="2" Grid.ColumnSpan="3" ItemsSource="{Binding SettingsView.AssetLanguages}" SelectedItem="{Binding SettingsView.SelectedAssetLanguage, Mode=TwoWay}"
                               DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}" Margin="0 0 0 5">
                         <ComboBox.ItemTemplate>
@@ -93,7 +93,7 @@
                               DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}" SelectionChanged="OnSelectionChanged" Margin="0 0 0 5">
                     </ComboBox>
 
-                    <TextBlock Grid.Row="7" Grid.Column="0" Text="UE Versions *" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="Override the UE version to use when parsing assets" />
+                    <TextBlock Grid.Row="7" Grid.Column="0" Text="UE Versions *" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="Override the UE version to use when parsing packages" />
                     <ComboBox Grid.Row="7" Grid.Column="2" Grid.ColumnSpan="3" ItemsSource="{Binding SettingsView.UeGames}" SelectedItem="{Binding SettingsView.SelectedUeGame, Mode=TwoWay}"
                               DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}" IsEnabled="{Binding SettingsView.EnableElements}"
                               Margin="0 0 0 5">
@@ -158,7 +158,7 @@
                         </ComboBox.ItemTemplate>
                     </ComboBox>
 
-                    <TextBlock Grid.Row="11" Grid.Column="0" Text="Keep Directory Structure" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="Auto Export &#38; Save assets inside their game directory" />
+                    <TextBlock Grid.Row="11" Grid.Column="0" Text="Keep Directory Structure" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="Auto-save packages following their game directory" />
                     <CheckBox Grid.Row="11" Grid.Column="2" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
                               IsChecked="{Binding KeepDirectoryStructure, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" Margin="0 5 0 10"/>
 
@@ -284,8 +284,8 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
-                    <TextBlock Grid.Row="0" Grid.Column="0" Text="Model Saving Directory *" VerticalAlignment="Center" Margin="0 0 0 5"
-                               ToolTip="This will be the directory where Meshes, Materials and Animations will be saved" />
+                    <TextBlock Grid.Row="0" Grid.Column="0" Text="Model Export Directory *" VerticalAlignment="Center" Margin="0 0 0 5"
+                               ToolTip="This will be the directory where Meshes, Materials and Animations will be exported" />
                     <TextBox Grid.Row="0" Grid.Column="2" Text="{Binding ModelDirectory, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0 0 0 5" />
                     <Button Grid.Row="0" Grid.Column="4" Content="..." HorizontalAlignment="Right" Click="OnBrowseModels" Margin="0 0 0 5" />
 
@@ -319,7 +319,7 @@
                                   IsChecked="{Binding PreviewMaterials, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}"/>
                     </UniformGrid>
 
-                    <TextBlock Grid.Row="4" Grid.Column="0" Text="Auto-Save without Previewing" VerticalAlignment="Center" Margin="0 0 0 5" />
+                    <TextBlock Grid.Row="4" Grid.Column="0" Text="Auto-Export without Previewing" VerticalAlignment="Center" Margin="0 0 0 5" />
                     <UniformGrid Grid.Row="4" Grid.Column="2" Grid.ColumnSpan="3" HorizontalAlignment="Stretch" Rows="1" Columns="3" Margin="0 5 0 10">
                         <CheckBox Content="Static Meshes" HorizontalAlignment="Left"
                                   IsChecked="{Binding SaveStaticMeshes, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" />
@@ -329,12 +329,12 @@
                                   IsChecked="{Binding SaveMaterials, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}"/>
                     </UniformGrid>
 
-                    <TextBlock Grid.Row="5" Grid.Column="0" Text="Auto-Save Animations" VerticalAlignment="Center" Margin="0 0 0 5" />
+                    <TextBlock Grid.Row="5" Grid.Column="0" Text="Auto-Export Animations" VerticalAlignment="Center" Margin="0 0 0 5" />
                     <CheckBox Grid.Row="5" Grid.Column="2" Grid.ColumnSpan="3" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
                               IsChecked="{Binding SaveAnimations, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}"
                               Style="{DynamicResource {x:Static adonisUi:Styles.ToggleSwitch}}" Margin="0 5 0 5"/>
 
-                    <TextBlock Grid.Row="6" Grid.Column="0" Text="Save Skeletons as Empty Meshes" VerticalAlignment="Center" />
+                    <TextBlock Grid.Row="6" Grid.Column="0" Text="Export Skeletons as Empty Meshes" VerticalAlignment="Center" />
                     <CheckBox Grid.Row="6" Grid.Column="2" Grid.ColumnSpan="3" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
                               IsChecked="{Binding SaveSkeletonAsMesh, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}"
                               Style="{DynamicResource {x:Static adonisUi:Styles.ToggleSwitch}}" Margin="0 5 0 0"/>