diff --git a/Knossos.NET/Classes/Knossos.cs b/Knossos.NET/Classes/Knossos.cs
index 9cb1f14d..c989812e 100644
--- a/Knossos.NET/Classes/Knossos.cs
+++ b/Knossos.NET/Classes/Knossos.cs
@@ -601,9 +601,9 @@ await Dispatcher.UIThread.Invoke(async () =>
                 }
                 else
                 {
-                    Log.Add(Log.LogSeverity.Error, "Knossos.CheckKnetUpdates()", "Get latest version from github resulted in null or tag_name being null.");
+                    Log.Add(Log.LogSeverity.Error, "Knossos.CheckKnetUpdates()", "Get latest version from GitHub resulted in null or tag_name being null.");
                     if (forceUpdateDownload)
-                        Console.WriteLine("Update Error! Get latest version from github resulted in null or tag_name being null.");
+                        Console.WriteLine("Update Error! Get latest version from GitHub resulted in null or tag_name being null.");
                 }
             }
             catch (Exception ex)
@@ -881,7 +881,7 @@ public static async void PlayMod(Mod mod, FsoExecType fsoExecType, bool standalo
                 var queryConflict = dependencyList.GroupBy(x => x.id).Where(g => g.Count() > 1).ToList();
                 if (queryConflict.Count() > 0)
                 {
-                    var outputString = "There is a dependency conflict for this mod: " + mod + " Knet will try to adjust but the mod may present issues or not work at all. \nThis may be be resolved manually using custom dependencies for this mod.\n";
+                    var outputString = "There is a dependency conflict for this mod: " + mod + " KnossosNET will try to adjust but the mod may present issues or not work at all. \nThis may be be resolved manually using custom dependencies for this mod.\n";
                     foreach (var conflictGroup in queryConflict)
                     {
                         foreach (var conflictDep in conflictGroup)
diff --git a/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs b/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs
index 7c364720..fbcde121 100644
--- a/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs
+++ b/Knossos.NET/ViewModels/GlobalSettingsViewModel.cs
@@ -1125,7 +1125,7 @@ internal async void BrowseFolderCommand()
                 {
                     Log.Add(Log.LogSeverity.Error, "GlobalSettings.BrowseFolderCommand() - test read/write was not successful: ", ex);
                     await Dispatcher.UIThread.Invoke(async () => {
-                        await MessageBox.Show(null, "Knossos was not able to write to this folder.  Please select another library folder.", "Cannot Select Folder", MessageBox.MessageBoxButtons.OK);
+                        await MessageBox.Show(null, "KnossosNET was not able to write to this folder.  Please select another library folder.", "Cannot Select Folder", MessageBox.MessageBoxButtons.OK);
                     }).ConfigureAwait(false);
                 }
             }
diff --git a/Knossos.NET/ViewModels/TaskViewModel.cs b/Knossos.NET/ViewModels/TaskViewModel.cs
index d42174a0..c8c73880 100644
--- a/Knossos.NET/ViewModels/TaskViewModel.cs
+++ b/Knossos.NET/ViewModels/TaskViewModel.cs
@@ -243,7 +243,7 @@ public int NumberOfTasks()
             {
                 await Dispatcher.UIThread.InvokeAsync(async () =>
                 {
-                    await MessageBox.Show(MainWindow.instance!, "Knossos library path is not set! Before installing mods go to settings and select a library folder.", "Error", MessageBox.MessageBoxButtons.OK);
+                    await MessageBox.Show(MainWindow.instance!, "KnossosNET library path is not set! Before installing mods go to settings and select a library folder.", "Error", MessageBox.MessageBoxButtons.OK);
                 });
                 return null;
             }
@@ -269,7 +269,7 @@ public async void InstallMod(Mod mod, List<ModPackage>? reinstallPkgs = null, bo
             {
                 await Dispatcher.UIThread.InvokeAsync(async () =>
                 {
-                    await MessageBox.Show(MainWindow.instance!, "Knossos library path is not set! Before installing mods go to settings and select a library folder.", "Error", MessageBox.MessageBoxButtons.OK);
+                    await MessageBox.Show(MainWindow.instance!, "KnossosNET library path is not set! Before installing mods go to settings and select a library folder.", "Error", MessageBox.MessageBoxButtons.OK);
                 });
                 return;
             }
diff --git a/Knossos.NET/ViewModels/Templates/Tasks/CreateModVersion.cs b/Knossos.NET/ViewModels/Templates/Tasks/CreateModVersion.cs
index 121e2fab..765f32d7 100644
--- a/Knossos.NET/ViewModels/Templates/Tasks/CreateModVersion.cs
+++ b/Knossos.NET/ViewModels/Templates/Tasks/CreateModVersion.cs
@@ -56,7 +56,7 @@ public async Task<bool> CreateModVersion(Mod oldMod, string newVersion, Cancella
 
                     using (StreamWriter writer = new StreamWriter(newDir + Path.DirectorySeparatorChar + "knossos_net_download.token"))
                     {
-                        writer.WriteLine("Warning: This token indicates an incomplete folder copy. If this token is present on the next Knet startup this folder WILL BE DELETED.");
+                        writer.WriteLine("Warning: This token indicates an incomplete folder copy. If this token is present on the next KnossosNET startup this folder WILL BE DELETED.");
                     }
 
                     await KnUtils.CopyDirectoryAsync(currentDir.FullName, newDir, true, cancellationTokenSource, copyCallback);
diff --git a/Knossos.NET/ViewModels/Templates/Tasks/InstallTool.cs b/Knossos.NET/ViewModels/Templates/Tasks/InstallTool.cs
index c08c7508..a564e595 100644
--- a/Knossos.NET/ViewModels/Templates/Tasks/InstallTool.cs
+++ b/Knossos.NET/ViewModels/Templates/Tasks/InstallTool.cs
@@ -55,7 +55,7 @@ public async Task<bool> InstallTool(Tool tool, Tool? updateFrom, Action<bool> fi
                     var libPath = Knossos.GetKnossosLibraryPath();
 
                     if (string.IsNullOrEmpty(libPath))
-                        throw new TaskCanceledException("Knossos library path is empty!");
+                        throw new TaskCanceledException("KnossosNET library path is empty!");
 
                     var toolPath = Path.Combine(libPath, "tools", tool.name);
                     if (updateFrom != null)
diff --git a/Knossos.NET/ViewModels/Windows/DevModCreateNewViewModel.cs b/Knossos.NET/ViewModels/Windows/DevModCreateNewViewModel.cs
index 335ac20f..a388c0fa 100644
--- a/Knossos.NET/ViewModels/Windows/DevModCreateNewViewModel.cs
+++ b/Knossos.NET/ViewModels/Windows/DevModCreateNewViewModel.cs
@@ -103,7 +103,7 @@ private async Task<bool> Verify()
             //Is library set?
             if(Knossos.GetKnossosLibraryPath() == null )
             {
-                await MessageBox.Show(MainWindow.instance, "Knossos library path is not set. Go to the settings tab and set the Knossos libreary location.", "Validation error", MessageBox.MessageBoxButtons.OK);
+                await MessageBox.Show(MainWindow.instance, "KnossosNET library path is not set. Go to the settings tab and set the KnossosNET library location.", "Validation error", MessageBox.MessageBoxButtons.OK);
                 return false;
             }
             //Version
diff --git a/Knossos.NET/ViewModels/Windows/Fs2InstallerViewModel.cs b/Knossos.NET/ViewModels/Windows/Fs2InstallerViewModel.cs
index e8d2c2a6..0f3b00ac 100644
--- a/Knossos.NET/ViewModels/Windows/Fs2InstallerViewModel.cs
+++ b/Knossos.NET/ViewModels/Windows/Fs2InstallerViewModel.cs
@@ -70,7 +70,7 @@ internal async void InstallFS2Command()
         {
             if(Knossos.GetKnossosLibraryPath() == null)
             {
-                await MessageBox.Show(MainWindow.instance!, "The Knossos library path is not set, first set the library path in the settings tab before installing FS2 Retail.", "Library path is null", MessageBox.MessageBoxButtons.OK);
+                await MessageBox.Show(MainWindow.instance!, "The KnossosNET library path is not set, first set the library path in the settings tab before installing FS2 Retail.", "Library path is null", MessageBox.MessageBoxButtons.OK);
                 return;
             }
             
@@ -310,7 +310,7 @@ await Task.Run(() => {
                         }
                     }
                     catch { }
-                    InstallText = "Install Complete!, Knossos is reloading the library...";
+                    InstallText = "Install Complete!, KnossosNET is reloading the library...";
                     Knossos.ResetBasePath();
                     if(gogExe != null)
                     {
diff --git a/Knossos.NET/Views/GlobalSettingsView.axaml b/Knossos.NET/Views/GlobalSettingsView.axaml
index 8baf56e4..35fda68f 100644
--- a/Knossos.NET/Views/GlobalSettingsView.axaml
+++ b/Knossos.NET/Views/GlobalSettingsView.axaml
@@ -21,126 +21,140 @@
 		<ScrollViewer Grid.Row="1">
 			<StackPanel>
 				<!--KNOSSOS SETTINGS-->
-				<Label Margin="5,10,0,0" FontWeight="Bold" FontSize="18" ToolTip.Tip="Settings that are specific to Knossos only. These settings do not affect the FSO engine.">Knossos</Label>
-				<Border Margin="0,5,0,0" BorderBrush="Black" BorderThickness="5" CornerRadius="2">
-					<StackPanel Margin="5">
-						<!-- Base Path -->
-						<Grid ColumnDefinitions="Auto,Auto,Auto" Margin="7,10,0,0">
-							<TextBlock Grid.Column="0" VerticalAlignment="Center" Width="200">Library Folder </TextBlock>
-							<TextBox Text="{Binding BasePath}" Margin="10,0,0,0" Grid.Column="1" IsReadOnly="True" Width="500"></TextBox>
-							<Button IsVisible="{Binding !IsPortableMode}" Margin="5,0,0,0" Grid.Column="2" Classes="Quaternary" Command="{Binding BrowseFolderCommand}">Browse</Button>
-						</Grid>
-						<!-- Lib Info -->
-						<Grid ColumnDefinitions="Auto,Auto,Auto" RowDefinitions="Auto, Auto" Margin="6,10,0,0">
-							<TextBlock Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" Width="200">Stats</TextBlock>
-							<WrapPanel Grid.Column="1" Grid.Row="0"  Margin="8,2,0,0">
-								<Label Margin="0,5,0,0" FontWeight="Bold" ToolTip.Tip="How many standalone games and modifications (collectively known as mods) are installed in your Knossos library.">Mods:</Label>
-								<TextBlock Margin="5,8,0,0" Text="{Binding NumberOfMods}"></TextBlock>
-								<Label Margin="40,5,0,0" FontWeight="Bold">Builds:</Label>
-								<TextBlock Margin="5,8,0,0" Text="{Binding NumberOfBuilds}"></TextBlock>
-								<Button Margin="40,0,0,0" Classes="Settings" Command="{Binding CleanupLibraryCommand}">Remove Unused Dependencies</Button>
+          <Expander VerticalAlignment="Top" Margin="5" MinWidth="400">
+            <Expander.Header>
+							<Label Margin="5,0,0,0" FontWeight="Bold" FontSize="18" ToolTip.Tip="Settings that are specific to KnossosNET only. These settings do not affect the FSO engine.">
+                Knossos Settings
+              </Label>
+            </Expander.Header>
+            <StackPanel Margin="5">
+							<!-- Base Path -->
+							<Grid ColumnDefinitions="Auto,Auto,Auto" Margin="7,10,0,0">
+								<TextBlock Grid.Column="0" VerticalAlignment="Center" Width="200">Library Folder </TextBlock>
+								<TextBox Text="{Binding BasePath}" Margin="10,0,0,0" Grid.Column="1" IsReadOnly="True" Width="500"></TextBox>
+								<Button IsVisible="{Binding !IsPortableMode}" Margin="5,0,0,0" Grid.Column="2" Classes="Quaternary" Command="{Binding BrowseFolderCommand}">Browse</Button>
+							</Grid>
+							<!-- Lib Info -->
+							<Grid ColumnDefinitions="Auto,Auto,Auto" RowDefinitions="Auto, Auto" Margin="6,10,0,0">
+								<TextBlock Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" Width="200">Stats</TextBlock>
+								<WrapPanel Grid.Column="1" Grid.Row="0"  Margin="8,2,0,0">
+									<Label Margin="0,5,0,0" FontWeight="Bold" ToolTip.Tip="How many standalone games and modifications (collectively known as mods) are installed in your KnossosNET library.">Mods:</Label>
+									<TextBlock Margin="5,8,0,0" Text="{Binding NumberOfMods}"></TextBlock>
+									<Label Margin="40,5,0,0" FontWeight="Bold">Builds:</Label>
+									<TextBlock Margin="5,8,0,0" Text="{Binding NumberOfBuilds}"></TextBlock>
+									<Button Margin="40,0,0,0" Classes="Settings" Command="{Binding CleanupLibraryCommand}">Remove Unused Dependencies</Button>
+								</WrapPanel>
+							</Grid>
+							<WrapPanel Margin="6,10,0,0">	
+								<Label Margin="0,5,0,0" Width="200">Retail Freespace 2</Label>
+								<CheckBox Margin="10,0,0,0" IsVisible="{Binding Fs2RootPack}" IsEnabled="False" IsChecked="{Binding Fs2RootPack}"></CheckBox>
+								<Button Classes="Quaternary" Command="{Binding InstallFS2Command}" IsVisible="{Binding !Fs2RootPack}" Margin="10,0,0,0">Installer</Button>
 							</WrapPanel>
-						</Grid>
-						<WrapPanel Margin="6,10,0,0">	
-							<Label Margin="0,5,0,0" Width="200">Retail Freespace 2</Label>
-							<CheckBox Margin="10,0,0,0" IsVisible="{Binding Fs2RootPack}" IsEnabled="False" IsChecked="{Binding Fs2RootPack}"></CheckBox>
-							<Button Classes="Quaternary" Command="{Binding InstallFS2Command}" IsVisible="{Binding !Fs2RootPack}" Margin="10,0,0,0">Installer</Button>
-						</WrapPanel>
-						<WrapPanel Margin="8,10,0,0">
-							<TextBlock VerticalAlignment="Center" Width="200">Mod Compression</TextBlock>
-							<ComboBox SelectedIndex="{Binding ModCompression}" ToolTip.Tip="Knossos can try to compress mod files in order to save disk space, and in some cases reduce loading times. 'Manual' means you will have to change a modpack's compression from mod settings or during installation. 'Always' means Knossos will compress all mods during install. 'Mod Support' means Knossos will compress the files only if the mod FSO engine dependency set by the mod is over the minimum, and if the mod uses an official build." Grid.Column="1" Width="150" Margin="10,0,0,0">
-								<ComboBoxItem Tag="0">Disabled</ComboBoxItem>
-								<ComboBoxItem Tag="1">Manual</ComboBoxItem>
-								<ComboBoxItem Tag="2">Always</ComboBoxItem>
-								<ComboBoxItem Tag="3">Mod Support</ComboBoxItem>
-							</ComboBox>
-							<NumericUpDown IsEnabled="{Binding ModCompression}" Margin="10,0,0,0" Width="120" Grid.Column="2" Minimum="1" Maximum="8" Value="{Binding CompressionMaxParallelism}" ToolTip.Tip="Max number of parallel compression tasks"></NumericUpDown>
-						</WrapPanel>
-						<!-- AutoUpdates -->
-                        <WrapPanel Margin="5,10,0,0">
-                            <Label Margin="0,5,0,0" Width="205">Check for updates at startup</Label>
-							<ToggleSwitch IsChecked="{Binding CheckUpdates}" Margin="5,0,0,0" ToolTip.Tip="Knossos.NET will connect to the GitHub repo to check for available updates at the start."></ToggleSwitch>
-						</WrapPanel>
-                        <WrapPanel Margin="5,10,0,0">
-                            <Label Margin="0,5,0,0" Width="205">Auto Update Knet</Label>
-							<ToggleSwitch IsVisible="{Binding CheckUpdates}" Margin="5,0,0,0" IsChecked="{Binding AutoUpdate}" ToolTip.Tip="The update will be automatically downloaded and installed. KnossosNET will be restarted without any user input."></ToggleSwitch>
-						</WrapPanel>
-						<WrapPanel Margin="5,10,0,0">
-							<Label Margin="0,5,0,0" Width="205">Auto Update FSO Builds</Label>
-							<CheckBox Margin="5,0,0,0" IsChecked="{Binding UpdateStable}" ToolTip.Tip="Knet will check for newer Stable FSO builds at the start and automatically download them if one is available">Stable</CheckBox>
-							<CheckBox Margin="5,0,0,0" IsChecked="{Binding UpdateRC}" ToolTip.Tip="Knet will check for newer RCs (Release Candidate) FSO builds at the start and automatically download them if one is available. Note: RC are only downloaded if they are newer than the newerest available Stable.">RC</CheckBox>
-							<CheckBox Margin="5,0,0,0" IsChecked="{Binding UpdateNightly}" ToolTip.Tip="Knet will check for newer Nightly FSO builds at the start and automatically download them if one is available">Nightly</CheckBox>
-							<CheckBox Margin="5,0,0,0" IsChecked="{Binding DeleteOlder}" ToolTip.Tip="If this option is enabled, after an autoupdate Knet will delete older versions of installed FSO builds if they are not needed by any mod">Delete older versions</CheckBox>
-						</WrapPanel>
-                        <WrapPanel Margin="5,10,0,0">
-                            <Label Margin="0,5,0,0" Width="205">Delete Uploaded Mod Files</Label>
-							<ToggleSwitch Margin="5,0,0,0" IsChecked="{Binding DeleteUploadedFiles}" ToolTip.Tip="During the upload of a mod version, generates files are saved on a '{modfolder}\kn_upload' folder, if this option is enabled these unnecessary files files will be deleted after a successfull upload. You con choose to disable this option if you need to take a closer look or debug a problem."></ToggleSwitch>
-						</WrapPanel>
-						<!-- Image Cache -->
-						<WrapPanel Margin="5,10,0,0">
-							<Label VerticalAlignment="Center" Width="200" Content="Image Cache"/>
-							<Label Margin="10,0,0,0" VerticalAlignment="Center" Content="{Binding ImgCacheSize}"/>
-							<Button Command="{Binding ClearImageCache}" Margin="5,0,0,0" Classes="Quaternary">Clear</Button>
-						</WrapPanel>
-						<!-- SubTasks -->
-						<Grid ColumnDefinitions="Auto,Auto,Auto" Margin="7,10,0,0">
-							<TextBlock Grid.Column="0" VerticalAlignment="Center" Width="200">Concurrent Subtasks</TextBlock>
-							<ComboBox SelectedIndex="{Binding MaxConcurrentSubtasks}" ToolTip.Tip="All tasks are done in order, but some tasks like install tasks creates multiple subtasks to download files, etc. This setting controls how many of them can run simultaneously." Grid.Column="1" Width="150" Margin="10,0,0,0">
-								<ComboBoxItem Tag="1">1</ComboBoxItem>
-								<ComboBoxItem Tag="2">2</ComboBoxItem>
-								<ComboBoxItem Tag="3">3</ComboBoxItem>
-								<ComboBoxItem Tag="4">4</ComboBoxItem>
-							</ComboBox>
-						</Grid>
-						<!-- Bandwidth limit -->
-						<Grid ColumnDefinitions="Auto,Auto,Auto" Margin="7,10,0,0">
-							<TextBlock Grid.Column="0" VerticalAlignment="Center" Width="200">Bandwidth Limit</TextBlock>
-							<ComboBox SelectedIndex="{Binding MaxDownloadSpeedIndex}" ToolTip.Tip="Bandwidth limiter (Per Individual Download)" Grid.Column="1" Width="150" Margin="10,0,0,0">
-								<ComboBoxItem Tag="0">Unlimited</ComboBoxItem>
-								<ComboBoxItem Tag="1">0.5 MB/s</ComboBoxItem>
-								<ComboBoxItem Tag="2">1 MB/s</ComboBoxItem>
-								<ComboBoxItem Tag="3">2 MB/s</ComboBoxItem>
-								<ComboBoxItem Tag="4">3 MB/s</ComboBoxItem>
-								<ComboBoxItem Tag="5">4 MB/s</ComboBoxItem>
-								<ComboBoxItem Tag="6">5 MB/s</ComboBoxItem>
-								<ComboBoxItem Tag="7">6 MB/s</ComboBoxItem>
-								<ComboBoxItem Tag="8">7 MB/s</ComboBoxItem>
-								<ComboBoxItem Tag="9">8 MB/s</ComboBoxItem>
-								<ComboBoxItem Tag="10">9 MB/s</ComboBoxItem>
-								<ComboBoxItem Tag="11">10 MB/s</ComboBoxItem>
-							</ComboBox>
-						</Grid>
-						<!-- Mirror Blacklist -->
-						<Grid ColumnDefinitions="Auto,Auto,Auto" Margin="7,10,0,0">
-							<TextBlock Grid.Column="0" VerticalAlignment="Center" Width="200">Mirrors</TextBlock>
-							<WrapPanel Grid.Column="1" Margin="8,0,0,0">
-								<CheckBox Margin="0,0,0,0" IsChecked="{Binding !BlDlNebula}">dl.fsnebula.org</CheckBox>
-								<CheckBox Margin="25,0,0,0" IsChecked="{Binding !BlCfNebula}">cf.fsnebula.org</CheckBox>
-								<CheckBox Margin="25,0,0,0" IsChecked="{Binding !BlTalos}">talos.feralhosting.com</CheckBox>
+							<WrapPanel Margin="8,10,0,0">
+								<TextBlock VerticalAlignment="Center" Width="200">Mod Compression</TextBlock>
+								<ComboBox SelectedIndex="{Binding ModCompression}" ToolTip.Tip="KnossosNET can try to compress mod files in order to save disk space, and in some cases reduce loading times. 'Manual' means you will have to change a modpack's compression from mod settings or during installation. 'Always' means Knossos will compress all mods during install. 'Mod Support' means Knossos will compress the files only if the mod FSO engine dependency set by the mod is over the minimum, and if the mod uses an official build." Grid.Column="1" Width="150" Margin="10,0,0,0">
+									<ComboBoxItem Tag="0">Disabled</ComboBoxItem>
+									<ComboBoxItem Tag="1">Manual</ComboBoxItem>
+									<ComboBoxItem Tag="2">Always</ComboBoxItem>
+									<ComboBoxItem Tag="3">Mod Support</ComboBoxItem>
+								</ComboBox>
+								<NumericUpDown IsEnabled="{Binding ModCompression}" Margin="10,0,0,0" Width="120" Grid.Column="2" Minimum="1" Maximum="8" Value="{Binding CompressionMaxParallelism}" ToolTip.Tip="Max number of parallel compression tasks"></NumericUpDown>
+							</WrapPanel>
+							<!-- AutoUpdates -->
+							<WrapPanel Margin="5,10,0,0">
+								<Label Margin="0,5,0,0" Width="205">Check for updates at startup</Label>
+								<ToggleSwitch IsChecked="{Binding CheckUpdates}" Margin="5,0,0,0" ToolTip.Tip="Knossos.NET will connect to the GitHub repo to check for available updates at the start."></ToggleSwitch>
+							</WrapPanel>
+							<WrapPanel Margin="5,10,0,0">
+								<Label Margin="0,5,0,0" Width="205">Auto Update KnosssosNET</Label>
+								<ToggleSwitch IsVisible="{Binding CheckUpdates}" Margin="5,0,0,0" IsChecked="{Binding AutoUpdate}" ToolTip.Tip="The update will be automatically downloaded and installed. KnossosNET will be restarted without any user input."></ToggleSwitch>
+							</WrapPanel>
+							<WrapPanel Margin="5,10,0,0">
+								<Label Margin="0,5,0,0" Width="205">Auto Update FSO Builds</Label>
+								<CheckBox Margin="5,0,0,0" IsChecked="{Binding UpdateStable}" ToolTip.Tip="KnossosNET will check for newer Stable FSO builds at the start and automatically download them if one is available">Stable</CheckBox>
+								<CheckBox Margin="5,0,0,0" IsChecked="{Binding UpdateRC}" ToolTip.Tip="KnossosNET will check for newer RCs (Release Candidate) FSO builds at the start and automatically download them if one is available. Note: RC are only downloaded if they are newer than the newest available Stable.">RC</CheckBox>
+								<CheckBox Margin="5,0,0,0" IsChecked="{Binding UpdateNightly}" ToolTip.Tip="KnossosNET will check for newer Nightly FSO builds at the start and automatically download them if one is available">Nightly</CheckBox>
+								<CheckBox Margin="5,0,0,0" IsChecked="{Binding DeleteOlder}" ToolTip.Tip="If this option is enabled, after an autoupdate KnossosNET will delete older versions of installed FSO builds if they are not needed by any mod">Delete older versions</CheckBox>
+							</WrapPanel>
+							<WrapPanel Margin="5,10,0,0">
+								<Label Margin="0,5,0,0" Width="205">Delete Uploaded Mod Files</Label>
+								<ToggleSwitch Margin="5,0,0,0" IsChecked="{Binding DeleteUploadedFiles}" ToolTip.Tip="During the upload of a mod version, generates files are saved on a '{modfolder}\kn_upload' folder, if this option is enabled these unnecessary files files will be deleted after a successful upload. You con choose to disable this option if you need to take a closer look or debug a problem."></ToggleSwitch>
+							</WrapPanel>
+							<!-- Image Cache -->
+							<WrapPanel Margin="5,10,0,0">
+								<Label VerticalAlignment="Center" Width="200" Content="Image Cache"/>
+								<Label Margin="10,0,0,0" VerticalAlignment="Center" Content="{Binding ImgCacheSize}"/>
+								<Button Command="{Binding ClearImageCache}" Margin="5,0,0,0" Classes="Quaternary">Clear</Button>
+							</WrapPanel>
+							<!-- SubTasks -->
+							<Grid ColumnDefinitions="Auto,Auto,Auto" Margin="7,10,0,0">
+								<TextBlock Grid.Column="0" VerticalAlignment="Center" Width="200">Concurrent Subtasks</TextBlock>
+								<ComboBox SelectedIndex="{Binding MaxConcurrentSubtasks}" ToolTip.Tip="All tasks are done in order, but some tasks like install tasks creates multiple subtasks to download files, etc. This setting controls how many of them can run simultaneously." Grid.Column="1" Width="150" Margin="10,0,0,0">
+									<ComboBoxItem Tag="1">1</ComboBoxItem>
+									<ComboBoxItem Tag="2">2</ComboBoxItem>
+									<ComboBoxItem Tag="3">3</ComboBoxItem>
+									<ComboBoxItem Tag="4">4</ComboBoxItem>
+								</ComboBox>
+							</Grid>
+							<!-- Bandwidth limit -->
+							<Grid ColumnDefinitions="Auto,Auto,Auto" Margin="7,10,0,0">
+								<TextBlock Grid.Column="0" VerticalAlignment="Center" Width="200">Bandwidth Limit</TextBlock>
+								<ComboBox SelectedIndex="{Binding MaxDownloadSpeedIndex}" ToolTip.Tip="Bandwidth limiter (Per Individual Download)" Grid.Column="1" Width="150" Margin="10,0,0,0">
+									<ComboBoxItem Tag="0">Unlimited</ComboBoxItem>
+									<ComboBoxItem Tag="1">0.5 MB/s</ComboBoxItem>
+									<ComboBoxItem Tag="2">1 MB/s</ComboBoxItem>
+									<ComboBoxItem Tag="3">2 MB/s</ComboBoxItem>
+									<ComboBoxItem Tag="4">3 MB/s</ComboBoxItem>
+									<ComboBoxItem Tag="5">4 MB/s</ComboBoxItem>
+									<ComboBoxItem Tag="6">5 MB/s</ComboBoxItem>
+									<ComboBoxItem Tag="7">6 MB/s</ComboBoxItem>
+									<ComboBoxItem Tag="8">7 MB/s</ComboBoxItem>
+									<ComboBoxItem Tag="9">8 MB/s</ComboBoxItem>
+									<ComboBoxItem Tag="10">9 MB/s</ComboBoxItem>
+									<ComboBoxItem Tag="11">10 MB/s</ComboBoxItem>
+								</ComboBox>
+							</Grid>
+							<!-- Mirror Blacklist -->
+							<Grid ColumnDefinitions="Auto,Auto,Auto" Margin="7,10,0,0">
+								<TextBlock Grid.Column="0" VerticalAlignment="Center" Width="200">Mirrors</TextBlock>
+								<WrapPanel Grid.Column="1" Margin="8,0,0,0">
+									<CheckBox Margin="0,0,0,0" IsChecked="{Binding !BlDlNebula}">dl.fsnebula.org</CheckBox>
+									<CheckBox Margin="25,0,0,0" IsChecked="{Binding !BlCfNebula}">cf.fsnebula.org</CheckBox>
+									<CheckBox Margin="25,0,0,0" IsChecked="{Binding !BlTalos}">talos.feralhosting.com</CheckBox>
+								</WrapPanel>
+							</Grid>
+							<!-- Log File -->
+							<WrapPanel Margin="5,10,0,0">
+								<Label Margin="0,5,0,0" Width="210">Enable Logging</Label>
+								<ToggleSwitch Margin="1,0,0,0" IsChecked="{Binding EnableLogFile}"></ToggleSwitch>
+							</WrapPanel>
+							<WrapPanel Margin="5,10,0,0">
+									<Label Margin="0,5,0,0" Width="200">Logging Level</Label> 
+									<ComboBox SelectedIndex="{Binding LogLevel}" IsEnabled="{Binding EnableLogFile}" Grid.Column="1" Width="150" Margin="11,0,0,0">
+									<ComboBoxItem Tag="0">Information</ComboBoxItem>
+									<ComboBoxItem Tag="1">Warning</ComboBoxItem>
+									<ComboBoxItem Tag="2">Error</ComboBoxItem>
+								</ComboBox>
 							</WrapPanel>
-						</Grid>
-						<!-- Log File -->
-						<WrapPanel Margin="5,10,0,0">
-                            <Label Margin="0,5,0,0" Width="210">Enable Logging</Label>
-							<ToggleSwitch Margin="1,0,0,0" IsChecked="{Binding EnableLogFile}"></ToggleSwitch>
-						</WrapPanel>
-						<WrapPanel Margin="5,10,0,0">
-                            <Label Margin="0,5,0,0" Width="200">Logging Level</Label> 
-							<ComboBox SelectedIndex="{Binding LogLevel}" IsEnabled="{Binding EnableLogFile}" Grid.Column="1" Width="150" Margin="11,0,0,0">
-								<ComboBoxItem Tag="0">Information</ComboBoxItem>
-								<ComboBoxItem Tag="1">Warning</ComboBoxItem>
-								<ComboBoxItem Tag="2">Error</ComboBoxItem>
-							</ComboBox>
-						</WrapPanel>
 					</StackPanel>
-				</Border>
+        </Expander>
+
 				<!--VIDEO SETTINGS-->
-				<Label Margin="5,15,0,0" FontWeight="Bold" FontSize="18" ToolTip.Tip="Video settings the FSO engine will use in-game.">Video</Label>
-				<TextBox BorderBrush="Transparent" IsReadOnly="True" TextWrapping="Wrap" Margin="5,0,5,0" Foreground="Yellow">Note, video settings for most mods using FSO version 24.2.0 or higher will need to be changed in-game by default. To change these new settings, play a modern mod and then go to the in-game "Options" menu.</TextBox>
-				<Border Margin="0,5,0,0" BorderBrush="Black" BorderThickness="5" CornerRadius="2">
+        <Expander VerticalAlignment="Top" Margin="5" MinWidth="400">
+          <Expander.Header>
+            <Label Margin="5,0,0,0" FontWeight="Bold" FontSize="18" ToolTip.Tip="Video settings the FSO engine will use in-game.">
+              Video Settings
+            </Label>
+          </Expander.Header>
 					<StackPanel Margin="5">
+						<TextBox BorderBrush="Transparent" IsReadOnly="True" TextWrapping="Wrap" Margin="5,-5,5,5" Foreground="Yellow" MaxWidth="600" HorizontalAlignment="Left">
+              Note, video settings for most mods using FSO version 24.2.0 or higher will need to be changed in-game by default.
+              To change these new settings, play a modern mod and then go to the in-game "Options" menu.
+						</TextBox>
+            <!-- Performance Tips (keep on separate row to ensure resizing looks better) -->
+						<Button Margin="5" Command="{Binding OpenPerformanceHelp}" Classes="Quaternary" Content="Tips to Optimize Game Performance" ToolTip.Tip="View help for optimizing performance" HorizontalAlignment="Left"></Button>
 						<!-- Resolution -->
-						<WrapPanel Margin="5,0,0,0">
+						<WrapPanel Margin="5">
 							<TextBlock VerticalAlignment="Center" Width="200">Display Resolution</TextBlock>
 							<ComboBox ToolTip.Tip="Bit depth of display resolution. Should autodetect best option by default (likely 32)." SelectedIndex="{Binding BitsSelectedIndex}" IsVisible="{Binding FlagDataLoaded}" Grid.Column="2" Width="100" Margin="10,0,0,0">
 								<ComboBoxItem Tag="32">32 Bit</ComboBoxItem>
@@ -148,9 +162,8 @@
 							</ComboBox>
 							<TextBlock Text="First download a FSO build to enable this setting." IsVisible="{Binding !FlagDataLoaded}" VerticalAlignment="Center" Foreground="Red" FontWeight="Bold" Grid.Column="1" Width="500" Margin="10,0,0,0"></TextBlock>
 							<ComboBox ToolTip.Tip="Display resolution FSO will run at. Default is your system display resolution." SelectedIndex="{Binding ResolutionSelectedIndex}" ItemsSource="{Binding ResolutionItems}" IsVisible="{Binding FlagDataLoaded}" Grid.Column="1" Width="300" Margin="10,0,0,0"></ComboBox>
-							<Button Margin="130,0,0,0" Command="{Binding OpenPerformanceHelp}" Classes="Quaternary" Content="Tips to Optimize Game Performance" ToolTip.Tip="View help for optimizing performance" HorizontalAlignment="Right"></Button>
 						</WrapPanel>
-						<!-- Resolution -->
+						<!-- Texture Filtering -->
 						<Grid ColumnDefinitions="Auto,Auto,Auto" Margin="5">
 							<TextBlock Grid.Column="0" VerticalAlignment="Center" Width="200">Texture Filtering</TextBlock>
 							<ComboBox ToolTip.Tip="Trilinear is recommended for most systems." SelectedIndex="{Binding TextureSelectedIndex}" Grid.Column="1" Width="100" Margin="10,0,0,0">
@@ -216,7 +229,6 @@
 							<Label Margin="5,5,0,0" Width="210">Post Processing</Label>
 							<ToggleSwitch ToolTip.Tip="Enable basic Post Processing, which helps ensure visuals are balanced. Enabled by default." Tag="-no_post_process" IsChecked="{Binding PostProcess}"></ToggleSwitch>
 						</WrapPanel>
-
 						<!-- VSYNC -->
 						<WrapPanel>
 							<Label Margin="5,5,0,0" Width="210">VSync</Label>
@@ -233,13 +245,20 @@
 							<ToggleSwitch ToolTip.Tip="Displays a counter of the frames-per-second (FPS) in the upper left corner of the screen during missions. Disabled by default." Tag="-fps" IsChecked="{Binding ShowFps}"></ToggleSwitch>
 						</WrapPanel>
 					</StackPanel>
-				</Border>
+        </Expander>
 
 				<!--Audio SETTINGS-->
-				<Label Margin="5,15,0,0" FontWeight="Bold" FontSize="18" ToolTip.Tip="Audio settings the FSO engine will use in-game.">Audio</Label>
-				<TextBox BorderBrush="Transparent" IsReadOnly="True" TextWrapping="Wrap" Margin="5,0,5,0" Foreground="Yellow">Note, audio settings for most mods using FSO version 24.2.0 or higher will need to be changed in-game by default. To change these new settings, play a modern mod and then go to the in-game "Options" menu.</TextBox>
-				<Border Margin="0,5,0,0" BorderBrush="Black" BorderThickness="5" CornerRadius="2">
+        <Expander VerticalAlignment="Top" Margin="5" MinWidth="400">
+          <Expander.Header>
+            <Label Margin="5,0,0,0" FontWeight="Bold" FontSize="18" ToolTip.Tip="Audio settings the FSO engine will use in-game.">
+              Audio Settings
+            </Label>
+          </Expander.Header>
 					<StackPanel Margin="5">
+				    <TextBox BorderBrush="Transparent" IsReadOnly="True" TextWrapping="Wrap" Margin="5,-5,5,0" Foreground="Yellow" MaxWidth="600" HorizontalAlignment="Left">
+              Note, audio settings for most mods using FSO version 24.2.0 or higher will need to be changed in-game by default. 
+              To change these new settings, play a modern mod and then go to the in-game "Options" menu.
+            </TextBox>
 						<!-- Playback -->
 						<Grid ColumnDefinitions="Auto,Auto" Margin="5">
 							<TextBlock Grid.Column="0" VerticalAlignment="Center" Width="200">Playback Devices</TextBlock>
@@ -263,23 +282,23 @@
 							</ComboBox>
 						</Grid>
 						<!-- Enable EFX -->
-                        <WrapPanel>
-                            <Label Margin="4,5,0,0" Width="200">Enable EFX</Label>
+            <WrapPanel>
+              <Label Margin="4,5,0,0" Width="200">Enable EFX</Label>
 							<ToggleSwitch Tag="efx" Margin="11,0,0,0" IsChecked="{Binding EnableEFX}" ToolTip.Tip="Enables in-mission sound effects to play with an extra sound environment filter set by the mission designer. By default, this filter adds a reverb effect."></ToggleSwitch>
 						</WrapPanel>
 						<!-- Disable Audio -->
-                        <WrapPanel>
-                            <Label Margin="4,5,0,0" Width="200">Disable Audio</Label>
+            <WrapPanel>
+              <Label Margin="4,5,0,0" Width="200">Disable Audio</Label>
 							<ToggleSwitch Tag="-nosound" Margin="11,0,0,0" IsChecked="{Binding DisableAudio}"></ToggleSwitch>
 						</WrapPanel>
 						<!-- Disable Music -->
-                        <WrapPanel>
-                            <Label Margin="4,5,0,0" Width="200">Disable Music</Label>
+            <WrapPanel>
+              <Label Margin="4,5,0,0" Width="200">Disable Music</Label>
 							<ToggleSwitch Tag="-nomusic" Margin="11,0,0,0" IsChecked="{Binding DisableMusic}"></ToggleSwitch>
 						</WrapPanel>
 						<!-- TTS -->
-                        <WrapPanel>
-                            <Label Margin="4,5,0,0" Width="200">Enable Text to Speech</Label>
+            <WrapPanel>
+              <Label Margin="4,5,0,0" Width="200">Enable Text to Speech</Label>
 							<ToggleSwitch IsChecked="{Binding EnableTTS}" Margin="11,0,0,0"></ToggleSwitch>
 						</WrapPanel>
 						<Grid ColumnDefinitions="Auto,Auto,Auto" Margin="5">
@@ -305,13 +324,19 @@
 							<Slider Grid.Column="1" Width="500" Margin="10,0,0,0" Value="{Binding TtsVolume}" Maximum="100" Minimum="0"></Slider>
 						</Grid>
 					</StackPanel>
-				</Border>
+        </Expander>
 
 				<!--INPUT SETTINGS-->
-				<Label Margin="5,15,0,0" FontWeight="Bold" FontSize="18" ToolTip.Tip="Input settings where you can specify which of your plugged-in devices FSO can use in-game.">Input</Label>
-				<TextBox BorderBrush="Transparent" IsReadOnly="True" TextWrapping="Wrap" Margin="5,0,5,0" Foreground="Yellow">Note, input settings for most mods using FSO version 24.2.0 or higher will need to be changed in-game by default. To change these new settings, play a modern mod and then go to the in-game "Options" menu.</TextBox>
-				<Border Margin="0,5,0,0" BorderBrush="Black" BorderThickness="5" CornerRadius="2">
+        <Expander VerticalAlignment="Top" Margin="5" MinWidth="400">
+          <Expander.Header>
+            <Label Margin="5,0,0,0" FontWeight="Bold" FontSize="18" ToolTip.Tip="Input settings where you can specify which of your plugged-in devices FSO can use in-game.">
+              Input Settings
+            </Label>
+          </Expander.Header>
 					<StackPanel Margin="5">
+				    <TextBox BorderBrush="Transparent" IsReadOnly="True" TextWrapping="Wrap" Margin="5,0,5,0" Foreground="Yellow" MaxWidth="600" HorizontalAlignment="Left">
+              Note, input settings for most mods using FSO version 24.2.0 or higher will need to be changed in-game by default. To change these new settings, play a modern mod and then go to the in-game "Options" menu.
+            </TextBox>
             <?ignore
 							<!--Mouse and Joystick settings are saved in the pilot file, these values only edit the new in-game options which are not used-->
 							<Grid ColumnDefinitions="Auto,Auto" Margin="5">
@@ -352,11 +377,15 @@
 							<ComboBox Height="50" SelectedIndex="{Binding Joy4SelectedIndex}" ItemsSource="{Binding Joystick4Items}" IsVisible="{Binding FlagDataLoaded}" Grid.Column="1" Width="500" Margin="10,0,0,0"></ComboBox>
 						</Grid>
 					</StackPanel>
-				</Border>
+				</Expander>
 		
 				<!--FSO ENGINE SETTINGS-->
-				<Label Margin="5,15,0,0" FontWeight="Bold" FontSize="18" ToolTip.Tip="Additional settings that affect how the FSO engine runs.">Specialized</Label>
-				<Border Margin="0,5,0,5" BorderBrush="Black" BorderThickness="5" CornerRadius="2">
+        <Expander VerticalAlignment="Top" Margin="5" MinWidth="400">
+          <Expander.Header>
+            <Label Margin="5,0,0,0" FontWeight="Bold" FontSize="18" ToolTip.Tip="Additional settings that affect how the FSO engine runs.">
+              Specialized Settings
+            </Label>
+          </Expander.Header>
 					<StackPanel Margin="5">
 						<!-- FS2 Lang -->
 						<Grid ColumnDefinitions="Auto,Auto" Margin="5">
@@ -403,7 +432,7 @@
 							<Button Content="Adjust Debug Filters" Command="{Binding OpenDebugFilterView}"></Button>
 						</Grid>
 					</StackPanel>
-				</Border>
+				</Expander>
 
 				<!--Developer Settings-->
 				<Label IsVisible="{Binding ShowDevOptions}" Margin="5,15,0,0" FontWeight="Bold" FontSize="18" ToolTip.Tip="Advanced settings used by Hard-light devs.">Developer Options</Label>
@@ -426,7 +455,7 @@
 						<!-- EnvVars -->
 						<WrapPanel IsVisible="{Binding ShowDevOptions}" IsEnabled="{Binding ShowDevOptions}" Margin="5,10,0,0">
 							<Label Margin="0,5,0,0" Width="205">Pass environment variables to FSO</Label> 
-							<TextBox Text="{Binding EnvVars}" Margin="5,0,0,0" ToolTip.Tip="Expects a comma-seperated list." Width="500"></TextBox>
+							<TextBox Text="{Binding EnvVars}" Margin="5,0,0,0" ToolTip.Tip="Expects a comma-separated list." Width="500"></TextBox>
 						</WrapPanel>
 					</StackPanel>
 				</Border>
diff --git a/Knossos.NET/Views/Templates/DevModPkgMgrView.axaml b/Knossos.NET/Views/Templates/DevModPkgMgrView.axaml
index f99c075b..dd5b805d 100644
--- a/Knossos.NET/Views/Templates/DevModPkgMgrView.axaml
+++ b/Knossos.NET/Views/Templates/DevModPkgMgrView.axaml
@@ -62,7 +62,7 @@
 								<ComboBoxItem ToolTip.Tip="Automatically selected for installation, but the user can skip them">Recommended</ComboBoxItem>
 								<ComboBoxItem ToolTip.Tip="Not automatically selected, but user can add them during the install process">Optional</ComboBoxItem>
 							</ComboBox>
-							<CheckBox FontSize="12" IsChecked="{Binding PackVP}" Margin="10,0,0,0" ToolTip.Tip="Whether Knossos should pack the files in a VP on upload.&#x0a;Warning: VPs have a 2GB total size limit.">Make VP</CheckBox>
+							<CheckBox FontSize="12" IsChecked="{Binding PackVP}" Margin="10,0,0,0" ToolTip.Tip="Whether KnossosNET should pack the files in a VP on upload.&#x0a;Warning: VPs have a 2GB total size limit.">Make VP</CheckBox>
 							<Label FontSize="16" Margin="5,6,5,5" ToolTip.Tip="Current package folder size" Content="{Binding DiskSpace}"/>
 							<Button HorizontalAlignment="Right" Command="{Binding DeleteModPkg}" Margin="10,0,0,10" Classes="Cancel">Delete</Button>
 						</WrapPanel>
diff --git a/Knossos.NET/Views/Windows/AddSapiVoicesView.axaml b/Knossos.NET/Views/Windows/AddSapiVoicesView.axaml
index 3eda8df3..36262a85 100644
--- a/Knossos.NET/Views/Windows/AddSapiVoicesView.axaml
+++ b/Knossos.NET/Views/Windows/AddSapiVoicesView.axaml
@@ -20,9 +20,9 @@
 		<TextBlock Margin="10" TextWrapping="Wrap">Freespace 2 Open uses Windows SAPI as TTS engine. SAPI is now legacy and Windows 10/11 uses a new TTS system. Most of the voices for the new system can still be used by SAPI and FSO. In order to use it you will need to copy the registry entries, KnossosNET can do this for you.</TextBlock>
 		<Label Margin="10">First download the new voices for Windows in Speech Settings menu.</Label>
 		<Button Classes="Secondary" Command="{Binding OpenSpeechSettings}" Margin="10,0,0,0">Open Speech Settings</Button>
-		<Label Margin="10,0,0,0" FontSize="12" FontWeight="Bold">Recomended: Microsoft David (US) and Microsoft Mark (US) are the best ones.</Label>
-		<TextBlock TextWrapping="Wrap" Margin="10">Once the voices have finished installing click on the following button to copy the OneCore registry keys to the Sapi one</TextBlock>
-		<TextBlock TextWrapping="Wrap" Margin="10">The first time you do this a backup of the original sapi keys will be saved to the knossos data folder in cae you ever need it.</TextBlock>
+		<Label Margin="10,0,0,0" FontSize="12" FontWeight="Bold">Recommended: Microsoft David (US) and Microsoft Mark (US) are the best ones.</Label>
+		<TextBlock TextWrapping="Wrap" Margin="10">Once the voices have finished installing click on the following button to copy the OneCore registry keys to the SAPI one</TextBlock>
+		<TextBlock TextWrapping="Wrap" Margin="10">The first time you do this a backup of the original SAPI keys will be saved to the KnossosNET data folder in case you ever need it.</TextBlock>
 		<TextBlock TextWrapping="Wrap" Margin="10">Your user must have admin rights in order to work.</TextBlock>
 		<Button Classes="Secondary" Command="{Binding CopyKeys}" Margin="10,0,0,0">Copy Registry Keys</Button>
 		<TextBlock TextWrapping="Wrap" Margin="10">Thats it! Press "Reload Data" button on the settings tab to update the list of installed voices</TextBlock>
diff --git a/Knossos.NET/Views/Windows/CleanupKnossosLibraryView.axaml b/Knossos.NET/Views/Windows/CleanupKnossosLibraryView.axaml
index 751c7278..afc666d7 100644
--- a/Knossos.NET/Views/Windows/CleanupKnossosLibraryView.axaml
+++ b/Knossos.NET/Views/Windows/CleanupKnossosLibraryView.axaml
@@ -9,7 +9,7 @@
 		x:DataType="vm:CleanupKnossosLibraryViewModel"
 		Icon="/Assets/knossos-icon.ico"
 		WindowStartupLocation="CenterScreen"
-        Title="Knossos Library Cleanup" 
+        Title="KnossosNET Library Cleanup" 
 		SizeToContent="WidthAndHeight" 
 		CanResize="False">
 	
diff --git a/Knossos.NET/Views/Windows/DevModAdvancedUploadView.axaml b/Knossos.NET/Views/Windows/DevModAdvancedUploadView.axaml
index b3cf77b4..bbd46ab6 100644
--- a/Knossos.NET/Views/Windows/DevModAdvancedUploadView.axaml
+++ b/Knossos.NET/Views/Windows/DevModAdvancedUploadView.axaml
@@ -25,12 +25,12 @@
 			<v:LoadingIconView Grid.Row="0" IsVisible="{Binding Loading}" Width="80" Height="80" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="50,50,0,0" />
 
 			<WrapPanel Grid.Row="0">
-				<WrapPanel IsVisible="{Binding !Loading}" HorizontalAlignment="Left" ToolTip.Tip="Number of simultanous mod package compression. Recommended: 1 or 2. Warning: Very heavy cpu and ram usage.">
+				<WrapPanel IsVisible="{Binding !Loading}" HorizontalAlignment="Left" ToolTip.Tip="Number of simultaneous mod package compression. Recommended: 1 or 2. Warning: Very heavy cpu and ram usage.">
 					<Label FontSize="14" VerticalContentAlignment="Center" Margin="20">Parallel Compression Tasks</Label>
 					<NumericUpDown Background="{StaticResource BackgroundColorPrimary}" Increment="1" Width="110" Value="{Binding ParallelCompressing}" Minimum="1" Maximum="6" VerticalContentAlignment="Center" Margin="20"></NumericUpDown>
 				</WrapPanel>
 		
-				<WrapPanel IsVisible="{Binding !Loading}" HorizontalAlignment="Right" ToolTip.Tip="Number of simultanous mod packages uploads to Nebula. Recommended: 1">
+				<WrapPanel IsVisible="{Binding !Loading}" HorizontalAlignment="Right" ToolTip.Tip="Number of simultaneous mod packages uploads to Nebula. Recommended: 1">
 					<Label FontSize="14" VerticalContentAlignment="Center" Margin="20">Parallel Upload Tasks</Label>
 					<NumericUpDown Background="{StaticResource BackgroundColorPrimary}" Increment="1" Width="110" Value="{Binding ParallelUploads}" Minimum="1" Maximum="2" VerticalContentAlignment="Center" Margin="20"></NumericUpDown>
 				</WrapPanel>
@@ -44,7 +44,7 @@
 					<DataGridTemplateColumn MinWidth="85" MaxWidth="85" Header="Upload" IsReadOnly="False">
 						<DataGridTemplateColumn.CellTemplate>
 							<DataTemplate>
-								<CheckBox Margin="32,0,0,0" ToolTip.Tip="This package will be compressed and uploaded to nebula, the hash will be calculated after compression. You can disable uploading this package if it dosent have changes from the previous version and provide a file hash from an older version that will be used instead." VerticalContentAlignment="Center" HorizontalContentAlignment="Center" IsChecked="{Binding Upload}"/>
+								<CheckBox Margin="32,0,0,0" ToolTip.Tip="This package will be compressed and uploaded to nebula, the hash will be calculated after compression. You can disable uploading this package if it does not have changes from the previous version and provide a file hash from an older version that will be used instead." VerticalContentAlignment="Center" HorizontalContentAlignment="Center" IsChecked="{Binding Upload}"/>
 							</DataTemplate>
 						</DataGridTemplateColumn.CellTemplate>
 					</DataGridTemplateColumn>
diff --git a/Knossos.NET/Views/Windows/DevModCreateNewView.axaml b/Knossos.NET/Views/Windows/DevModCreateNewView.axaml
index dbf8e567..0e411773 100644
--- a/Knossos.NET/Views/Windows/DevModCreateNewView.axaml
+++ b/Knossos.NET/Views/Windows/DevModCreateNewView.axaml
@@ -43,7 +43,7 @@
 			<ComboBox IsVisible="{Binding !TypeSelectedIndex}" Width="460" Grid.Row="4" SelectedIndex="{Binding ParentSelectedIndex}" Grid.Column="1" ItemsSource="{Binding ParentComboBoxItems}" Margin="5"></ComboBox>
 			<!--Button-->
 			<Button Command="{Binding CreateMod}" Grid.Row="5" HorizontalAlignment="Left" Margin="165,40,0,0" Grid.Column="1" Classes="Accept">Create</Button>
-			<Label Margin="-45,0,0,0" Grid.Column="1" Grid.Row="6" IsVisible="{Binding !LoggedInNebula}" Foreground="Yellow">You are not logged in to Nebula, mod ID avalibly cannot be properly verified.</Label>
+			<Label Margin="-45,0,0,0" Grid.Column="1" Grid.Row="6" IsVisible="{Binding !LoggedInNebula}" Foreground="Yellow">You are not logged in to Nebula, mod ID availability cannot be properly verified.</Label>
 		</Grid>
 	</ScrollViewer>
 	
diff --git a/Knossos.NET/Views/Windows/Fs2InstallerView.axaml b/Knossos.NET/Views/Windows/Fs2InstallerView.axaml
index 4b18d533..f6547165 100644
--- a/Knossos.NET/Views/Windows/Fs2InstallerView.axaml
+++ b/Knossos.NET/Views/Windows/Fs2InstallerView.axaml
@@ -26,7 +26,7 @@
 					<Button Classes="Quaternary" IsEnabled="{Binding !IsInstalling}" Margin="10" Command="{Binding LoadFolderCommand}">Browse Folder</Button>
 					<Label Margin="5" FontWeight="Bold">Required File List:</Label>
 					<TextBlock Margin="10,0,0,0" Text="root_fs2.vp, smarty_fs2.vp, sparky_fs2.vp, sparky_hi_fs2.vp, stu_fs2.vp, tango1_fs2.vp, tango2_fs2.vp, tango3_fs2.vp, warble_fs2.vp" TextWrapping="Wrap"></TextBlock>
-					<Label Margin="5" FontWeight="Bold">After copying the files to the Knossos library, the original install is not longer needed.</Label>
+					<Label Margin="5" FontWeight="Bold">After copying the files to the KnossosNET library, the original install is not longer needed.</Label>
 				</StackPanel>
 			</Border>
 			
diff --git a/Knossos.NET/Views/Windows/ModInstallView.axaml b/Knossos.NET/Views/Windows/ModInstallView.axaml
index 7349a37a..3afa519a 100644
--- a/Knossos.NET/Views/Windows/ModInstallView.axaml
+++ b/Knossos.NET/Views/Windows/ModInstallView.axaml
@@ -73,8 +73,8 @@
 		</StackPanel>
 		<WrapPanel IsVisible="{Binding DataLoaded}" Grid.Row="4" HorizontalAlignment="Center">
 			<CheckBox IsVisible="{Binding CleanupVisible}" IsChecked="{Binding CleanupEnabled}" ToolTip.Tip="Delete older versions than the one you are installing if its not in use by other mods. Note: This only applies to this mod and not to its dependencies.">Remove old versions of this mod</CheckBox>
-			<CheckBox Margin="5,0,5,0" IsChecked="{Binding CleanInstall}" ToolTip.Tip="By default Knet will try to fetch files from older installed versions of this mod if they are identical. It will make hard-links to them if supported and enabled, or copy if hard-linking is not supported or is disabled. Forcing a clean installation will mean all files will be downloaded anew from nebula and no existing file will be re-used.">Force clean install</CheckBox>
-			<CheckBox Margin="0,0,5,0" IsVisible="{Binding !CleanInstall}" IsChecked="{Binding AllowHardlink}" ToolTip.Tip="If Knet finds files in other versions of this mod that are identical to the ones needed, it will copy them from disk instead of downloading them. But to save disk space you can use file hardlinks, this creates a reference to the file instead of copying it, that means that hardlinked files will be shared by an unlimited number of mod versions, despite only being on disk once. 
+			<CheckBox Margin="5,0,5,0" IsChecked="{Binding CleanInstall}" ToolTip.Tip="By default KnossosNET will try to fetch files from older installed versions of this mod if they are identical. It will make hard-links to them if supported and enabled, or copy if hard-linking is not supported or is disabled. Forcing a clean installation will mean all files will be downloaded anew from nebula and no existing file will be re-used.">Force clean install</CheckBox>
+			<CheckBox Margin="0,0,5,0" IsVisible="{Binding !CleanInstall}" IsChecked="{Binding AllowHardlink}" ToolTip.Tip="If KnossosNET finds files in other versions of this mod that are identical to the ones needed, it will copy them from disk instead of downloading them. But to save disk space you can use file hardlinks, this creates a reference to the file instead of copying it, that means that hardlinked files will be shared by an unlimited number of mod versions, despite only being on disk once. 
 			&#x0a;&#x0a;Note: Editing a hardlinked file will cause it to be edited for all versions using it. Also hardlinked files cannot be completely deleted unless all references to it are deleted.">Allow hardlinks</CheckBox>
 		</WrapPanel>
 	</Grid>
diff --git a/Knossos.NET/Views/Windows/QuickSetupView.axaml b/Knossos.NET/Views/Windows/QuickSetupView.axaml
index d540c57b..c07665f3 100644
--- a/Knossos.NET/Views/Windows/QuickSetupView.axaml
+++ b/Knossos.NET/Views/Windows/QuickSetupView.axaml
@@ -27,9 +27,9 @@
 		<!--Page1-->
 		<StackPanel IsVisible="{Binding Page1}" Grid.Row="0">
 			<TextBlock Margin="10" TextWrapping="Wrap" FontWeight="Bold" FontSize="36" HorizontalAlignment="Left" >Welcome To Knossos.NET</TextBlock>
-			<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" >This quick setup guide will help you through the basics of configuring the Knossos launcher for the first time. If you already know how to configure the launcher you can close this window.</TextBlock>
+			<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" >This quick setup guide will help you through the basics of configuring the KnossosNET launcher for the first time. If you already know how to configure the launcher you can close this window.</TextBlock>
 			<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" >Note, you can reopen this guide at any time, just go to the "Settings" tab and click the "Quick Setup Guide" button.</TextBlock>
-      <TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" >If at any point you ever need assistance with Knossos plese ask on the Knossos Discord channel linked below.</TextBlock>
+      <TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" >If you ever need assistance with KnossosNET please ask on the Knossos Discord channel linked below.</TextBlock>
       <Button Margin="20, 10" Command="{Binding OpenDiscordQuickSetup}">Discord Help for Knossos</Button>
 		</StackPanel>
 		
@@ -37,15 +37,15 @@
 		<StackPanel IsVisible="{Binding Page2}" Grid.Row="0" >
 			<StackPanel IsVisible="{Binding !IsPortableMode}">
 				<TextBlock Margin="10" TextWrapping="Wrap" FontWeight="Bold" FontSize="36" HorizontalAlignment="Left" >Setting up the library folder</TextBlock>
-				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">First, you must set a library folder. Go to the "Settings" tab and under the "Knossos" section click on the "Browse" button and choose or create a folder for Knossos to use. It is highly recommended to set this as an empty folder in a location with a large amount of available storage. Once you have set the folder be sure to click the "Save" button in the upper right corner of the "Settings" tab. </TextBlock>
-				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">The Knossos library folder is where all game and mod data will be saved to. Make sure you always have space available on this drive before installing a new mod or update.</TextBlock>
+				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">First, you must set a library folder. Go to the "Settings" tab and under the "KnossosNET" section click on the "Browse" button and choose or create a folder for Knossos to use. It is highly recommended to set this as an empty folder in a location with a large amount of available storage. Once you have set the folder be sure to click the "Save" button in the upper right corner of the "Settings" tab. </TextBlock>
+				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">The KnossosNET library folder is where all game and mod data will be saved to. Make sure you always have space available on this drive before installing a new mod or update.</TextBlock>
 				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" FontWeight="Bold" HorizontalAlignment="Left">Current Library Folder</TextBlock>
 				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" Text="{Binding LibraryPath}"></TextBlock>
 				<TextBlock IsVisible="{Binding !CanContinue}" Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">Go to the "Settings" tab and set the library folder to continue.</TextBlock>
 			</StackPanel>
 			<StackPanel IsVisible="{Binding IsPortableMode}">
-				<TextBlock Margin="10" TextWrapping="Wrap" FontWeight="Bold" FontSize="36" HorizontalAlignment="Left" >Knet is running in portable mode</TextBlock>
-				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">This means Knet settings and FSO pilots, settings and data are saved inside the 'kn_portable' folder, you can not set a library folder in this mode. </TextBlock>
+				<TextBlock Margin="10" TextWrapping="Wrap" FontWeight="Bold" FontSize="36" HorizontalAlignment="Left" >KnossosNET is running in portable mode</TextBlock>
+				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">This means KnossosNET settings and FSO pilots, settings and data are saved inside the 'kn_portable' folder, you can not set a library folder in this mode. </TextBlock>
 				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">If you ever need to stop using the portable mode move, rename or delete the 'kn_portable' folder</TextBlock>
 				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" FontWeight="Bold" HorizontalAlignment="Left">Current Library Folder</TextBlock>
 				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left" Text="{Binding LibraryPath}"></TextBlock>
@@ -57,8 +57,8 @@
 			<TextBlock Margin="10" TextWrapping="Wrap" FontWeight="Bold" FontSize="36" HorizontalAlignment="Left">Download an FSO engine build</TextBlock>
 			<TextBlock IsVisible="{Binding !RepoDownloaded}" Margin="20" TextWrapping="Wrap" FontSize="15" FontWeight="Bold" HorizontalAlignment="Left">Wait for repo_minimal.json to finish downloading before you continue...</TextBlock>
 			<StackPanel IsVisible="{Binding RepoDownloaded}">
-				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">Now you need a game engine build, which are known as "FSO Builds". These builds are what mods run on, and Knossos also uses it to get and display system data. This is why you are not going to be able to set most of the settings in the "Settings" tab before downloading one. </TextBlock>
-				<TextBlock IsVisible="{Binding BuildAvailable}" Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">Click the button below to download the lastest stable build, which is what most casual players use. You can also go to the "Engine" tab, and pick a specific build. The most recent build should be always the top one on the list.</TextBlock>
+				<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">Now you need a game engine build, which are known as "FSO Builds". These builds are what mods run on, and KnossosNET also uses it to get and display system data. This is why you are not going to be able to set most of the settings in the "Settings" tab before downloading one. </TextBlock>
+				<TextBlock IsVisible="{Binding BuildAvailable}" Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">Click the button below to download the latest stable build, which is what most casual players use. You can also go to the "Engine" tab, and pick a specific build. The most recent build should be always the top one on the list.</TextBlock>
 				<TextBlock IsVisible="{Binding !BuildAvailable}" Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">Go to the "Engine" tab, select "Stable Builds" and download the newest stable, it should be always the top one on the list.</TextBlock>
 				<Button IsVisible="{Binding BuildAvailable}" Margin="0,10,0,10" HorizontalAlignment="Center" Classes="Primary" Content="Download Latest Stable Build" Command="{Binding DownloadLatestStable}"/>
 				<TextBlock IsVisible="{Binding !CanContinue}" Margin="20" TextWrapping="Wrap" FontSize="15" FontWeight="Bold" HorizontalAlignment="Left">A FSO build must be downloaded before you continue...</TextBlock>
@@ -70,9 +70,9 @@
 		<!--Page4-->
 		<StackPanel IsVisible="{Binding Page4}" Grid.Row="0" >
 			<TextBlock Margin="10" TextWrapping="Wrap" FontWeight="Bold" FontSize="36" HorizontalAlignment="Left">Freespace 2 Retail (Optional)</TextBlock>
-			<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">In order to have access to Freespace 1 and 2 content and visual improvements you need to install Freespace 2 Retail in Knossos. If you do not install Freespace 2 Retail, then any content that needs the full Freespace 2 retail files will not be displayed on the "Explore" tab.</TextBlock>
-      <TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">If you do not have the retail FS2 installed into Knossos you can still play total conversion mods, which are mods that are compeltely standalone and do not depend on any of the Freespace content.</TextBlock>
-      <TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">To install Freespace 2 go to the "Settings" tab and open the "FS2 Retail Installer" button under the "Knossos Settings" section. Then follow the instructions there. If you already have FS2 installed this button is not available.</TextBlock>
+			<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">In order to have access to Freespace 1 and 2 content and visual improvements you need to install Freespace 2 Retail in KnossosNET. If you do not install Freespace 2 Retail, then any content that needs the full Freespace 2 retail files will not be displayed on the "Explore" tab.</TextBlock>
+      <TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">If you do not have the retail FS2 installed into KnossosNET you can still play total conversion mods, which are mods that are completely standalone and do not depend on any of the Freespace content.</TextBlock>
+      <TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" HorizontalAlignment="Left">To install Freespace 2 go to the "Settings" tab and open the "FS2 Retail Installer" button under the "KnossosNET Settings" section. Then follow the instructions there. If you already have FS2 installed this button is not available.</TextBlock>
 			<TextBlock Margin="20" TextWrapping="Wrap" FontSize="15" FontWeight="Bold" HorizontalAlignment="Left">This step is optional and you can continue at any time.</TextBlock>
 		</StackPanel>
 
diff --git a/README.md b/README.md
index 888d2f45..13b56bd0 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ The "Settings" window on a mod displays the Command Line to play that mod direct
 
 <br /><br />
 ## **Software Rendering Mode:**<br />
-By default Knet will render the UI in the GPU, can be set to run completely on software rendering what effectively avoids any use of the user GPU, this will come at the cost of increased CPU usage, what should not be a problem when in idle.
+By default KnossosNET will render the UI in the GPU, can be set to run completely on software rendering what effectively avoids any use of the user GPU, this will come at the cost of increased CPU usage, what should not be a problem when in idle.
 <br />
 You can force the software rendering mode by using the "-software" Command Line argument or by setting an environment variable "KNET_RENDER_MODE" to "software".
 
@@ -52,7 +52,7 @@ You can force the software rendering mode by using the "-software" Command Line
 ## **mod.ini Support:**<br />
 Using legacy mod.ini files for mod folders is also supported, and some additional keys were added to extend support. mod.ini can be used to attempt to load an old mod or to manually add a mod to the launcher whiout having to write a mod.json file. The folder still has to be placed in the correct path inside the library as with any other mod.<br />
 
-Details on how Knet handles mod.ini and the new keys can be found here:<br />
+Details on how KnossosNET handles mod.ini and the new keys can be found here:<br />
 https://wiki.hard-light.net/index.php/Mod.ini#KnossosNET_Support<br />
 
 <br /><br />