From 900b95e1c5743463a9d6af47446be9df1fdb1931 Mon Sep 17 00:00:00 2001
From: SvenGDK <svengdk@hotmail.com>
Date: Sun, 23 Apr 2023 21:34:05 +0200
Subject: [PATCH] Fixes and update to .NET FW 4.8.1

- Better drive checks
- Language settings changes
- Replaced the update text delegate
- RequestedExecutionLevel is now set to "highestAvailable" (shouldn't be necessary but some people still don't have the permission to format as admin)
- Other fixes
---
 Newest/XboxMediaUSB-N/App.config              |   6 +-
 Newest/XboxMediaUSB-N/Application.xaml.vb     |   3 -
 Newest/XboxMediaUSB-N/MainWindow.xaml         |   4 +-
 Newest/XboxMediaUSB-N/MainWindow.xaml.vb      | 443 +++++++++++-------
 .../XboxMediaUSB-N/My Project/AssemblyInfo.vb |   8 +-
 Newest/XboxMediaUSB-N/My Project/app.manifest |  67 +--
 Newest/XboxMediaUSB-N/XboxMediaUSB-N.vbproj   |  24 +-
 Newest/XboxMediaUSB-N/bin/Debug/config.ini    |   2 -
 .../XboxMediaUSB-N/bin/Debug/languages/DE.ini |  30 --
 .../XboxMediaUSB-N/bin/Debug/languages/EN.ini |  30 --
 .../XboxMediaUSB-N/bin/Debug/languages/ES.ini |  26 -
 .../XboxMediaUSB-N/bin/Debug/languages/FR.ini |  30 --
 12 files changed, 306 insertions(+), 367 deletions(-)
 delete mode 100644 Newest/XboxMediaUSB-N/bin/Debug/config.ini
 delete mode 100644 Newest/XboxMediaUSB-N/bin/Debug/languages/DE.ini
 delete mode 100644 Newest/XboxMediaUSB-N/bin/Debug/languages/EN.ini
 delete mode 100644 Newest/XboxMediaUSB-N/bin/Debug/languages/ES.ini
 delete mode 100644 Newest/XboxMediaUSB-N/bin/Debug/languages/FR.ini

diff --git a/Newest/XboxMediaUSB-N/App.config b/Newest/XboxMediaUSB-N/App.config
index 193aecc..5ab1a35 100644
--- a/Newest/XboxMediaUSB-N/App.config
+++ b/Newest/XboxMediaUSB-N/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/>
     </startup>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/Newest/XboxMediaUSB-N/Application.xaml.vb b/Newest/XboxMediaUSB-N/Application.xaml.vb
index 084cbe9..b97bb85 100644
--- a/Newest/XboxMediaUSB-N/Application.xaml.vb
+++ b/Newest/XboxMediaUSB-N/Application.xaml.vb
@@ -1,6 +1,3 @@
 Class Application
 
-    ' Application-level events, such as Startup, Exit, and DispatcherUnhandledException
-    ' can be handled in this file.
-
 End Class
diff --git a/Newest/XboxMediaUSB-N/MainWindow.xaml b/Newest/XboxMediaUSB-N/MainWindow.xaml
index ed5570d..d730e25 100644
--- a/Newest/XboxMediaUSB-N/MainWindow.xaml
+++ b/Newest/XboxMediaUSB-N/MainWindow.xaml
@@ -11,9 +11,9 @@
         <TextBlock x:Name="PrepareNewTextBlock" HorizontalAlignment="Left" Margin="13,167,0,0" TextWrapping="Wrap" Text="Prepare new a USB drive" VerticalAlignment="Top" FontSize="16" Width="250" TextAlignment="Center"/>
         <ComboBox x:Name="DriveList1" HorizontalAlignment="Left" Margin="13,228,0,0" VerticalAlignment="Top" Width="250"/>
         <TextBlock x:Name="SelectUSBFromListTextBlock1" HorizontalAlignment="Left" Margin="13,207,0,0" TextWrapping="Wrap" Text="Select a removable USB drive from the list :" VerticalAlignment="Top" Width="250" TextAlignment="Center"/>
-        <TextBlock x:Name="WarningTextBlock" HorizontalAlignment="Left" Margin="13,255,0,0" TextWrapping="Wrap" Text="Warning: All Data on this drive will be erased!" VerticalAlignment="Top" FontWeight="Bold" FontSize="10" Width="250" TextAlignment="Center"/>
+        <TextBlock x:Name="WarningTextBlock" HorizontalAlignment="Left" Margin="13,255,0,0" TextWrapping="Wrap" Text="Warning: All Data on this drive will be erased!" VerticalAlignment="Top" FontWeight="Bold" FontSize="10" Width="250" TextAlignment="Center" FontStyle="Italic" Foreground="#FFC10000"/>
         <Button x:Name="FormatUSBButton" Content="Format USB" HorizontalAlignment="Left" Margin="47,353,0,0" VerticalAlignment="Top" Width="173"/>
-        <TextBlock x:Name="OptionsTextBlock" HorizontalAlignment="Left" Margin="38,279,0,0" TextWrapping="Wrap" Text="Options :" VerticalAlignment="Top"/>
+        <TextBlock x:Name="OptionsTextBlock" HorizontalAlignment="Left" Margin="13,279,0,0" TextWrapping="Wrap" Text="Options :" VerticalAlignment="Top" Width="250" TextAlignment="Center" FontWeight="Bold"/>
         <CheckBox x:Name="CreateDefaultFoldersCheckBox" Content="Create default folders" HorizontalAlignment="Left" Margin="65,303,0,0" VerticalAlignment="Top" IsChecked="True" Width="198"/>
         <CheckBox x:Name="SetUSBIconCheckBox" Content="Set USB drive icon" HorizontalAlignment="Left" Margin="65,323,0,0" VerticalAlignment="Top" IsChecked="False" Width="198"/>
         <Image HorizontalAlignment="Left" Height="64" Margin="382,98,0,0" VerticalAlignment="Top" Width="64" Source="/permissions.png"/>
diff --git a/Newest/XboxMediaUSB-N/MainWindow.xaml.vb b/Newest/XboxMediaUSB-N/MainWindow.xaml.vb
index 81bbb3d..678240d 100644
--- a/Newest/XboxMediaUSB-N/MainWindow.xaml.vb
+++ b/Newest/XboxMediaUSB-N/MainWindow.xaml.vb
@@ -2,42 +2,126 @@
 Imports System.IO
 Imports System.Reflection
 Imports System.Runtime.InteropServices
+Imports System.Security.AccessControl
+Imports System.Security.Principal
 Imports System.Text
 
 Class MainWindow
 
-    Dim SelectedDrive As DriveInfo
-    Dim ConfigFile As INI.IniFile
-    Dim CurrentLanguage As String
-    Dim LanguageConfig As INI.IniFile
+    'Store selected drive infos
+    Dim SelectedDrive As DriveInfo = Nothing
 
+    'Config and language settings
+    Dim ConfigFile As INI.IniFile = Nothing
+    Dim CurrentLanguage As String = ""
+    Dim LanguageConfig As INI.IniFile = Nothing
+
+    'BackgroundWorkers
     Dim WithEvents FormatWorker As New BackgroundWorker()
     Dim WithEvents PermissionWorker As New BackgroundWorker()
 
-    Delegate Sub UpdateTextStatusDelegate(StatTextBlock As TextBlock, StringValue As String)
+    Private Sub MainWindow_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+        'Set Window Title and add current version
+        Dim VersionString As String = String.Format("{0}.{1}", My.Application.Info.Version.Major, My.Application.Info.Version.Minor)
+        Title = "XboxMediaUSB v" + VersionString
+
+        'Add all available languages from 'languages' directory to the LanguagesComboBox (in case you want to load a language that has not been added yet)
+        For Each Language As String In Directory.GetFiles(My.Computer.FileSystem.CurrentDirectory + "\languages", "*.ini")
+            Dim LanguageName As String = Path.GetFileNameWithoutExtension(Language)
+            LanguagesComboBox.Items.Add(LanguageName)
+        Next
+
+        'Load config and language file if exists
+        If File.Exists(My.Computer.FileSystem.CurrentDirectory + "\config.ini") And File.Exists(My.Computer.FileSystem.CurrentDirectory + "\languages\EN.ini") Then
+
+            'Set the general config file
+            ConfigFile = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\config.ini")
+
+            'Check if any language is set in the config file
+            If Not ConfigFile.ReadValue("Config", "Language") = "" Then
+
+                'Get and set the language
+                CurrentLanguage = ConfigFile.ReadValue("Config", "Language")
+                If Not CurrentLanguage = "EN" Then
+                    'If it's not English then change the language
+                    LanguageConfig = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\languages\" + CurrentLanguage + ".ini")
+                    ChangeUILanguage()
+                Else
+                    'Set to English - Required for dialog strings
+                    LanguageConfig = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\languages\EN.ini")
+                End If
+
+            Else
+                'Set the key if no language is set
+                ConfigFile.WriteValue("Config", "Language", "EN")
+                LanguageConfig = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\languages\EN.ini")
+            End If
+
+        Else 'Config file and language folder do not exist
+            CheckConfigAndLanguage()
+            ConfigFile = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\config.ini") 'Set the general config file
+            CurrentLanguage = "EN" 'Set the language
+            LanguageConfig = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\languages\EN.ini") 'Set language config
+            ChangeUILanguage() 'Load
+        End If
+
+        'Set the language in LanguagesComboBox
+        LanguagesComboBox.SelectedItem = CurrentLanguage
+
+        'List removable and fixed drives in 'Ready' state
+        For Each Drive As DriveInfo In DriveInfo.GetDrives()
+            If Drive.DriveType = DriveType.Removable And Drive.IsReady Or Drive.DriveType = DriveType.Fixed And Drive.IsReady Then
+                If Not Drive.Name = "C:\" Then 'Do not add C:\
+                    DriveList1.Items.Add(Drive.Name + vbTab + Drive.VolumeLabel)
+                    DriveList2.Items.Add(Drive.Name + vbTab + Drive.VolumeLabel)
+                End If
+            End If
+        Next
 
-    Public Sub TextDelegateMethod(StatTextBlock As TextBlock, StringValue As String)
-        StatusTextBlock.Text = StringValue
     End Sub
 
-    Public Sub FormatDrive()
-        Dim FormatStartInfo As New ProcessStartInfo With {
-            .FileName = "format.com",
-            .Arguments = "/fs:NTFS /v:XboxMediaUSBv2 /q " + SelectedDrive.Name.Remove(2),
-            .UseShellExecute = False,
-            .CreateNoWindow = True,
-            .RedirectStandardOutput = True, 'Required
-            .RedirectStandardInput = True
-        }
-
-        'Start format without user interaction
-        Dim FormatProcess As Process = Process.Start(FormatStartInfo)
-        Dim ProcessInputStream As StreamWriter = FormatProcess.StandardInput
-        ProcessInputStream.Write(vbCr & vbLf)
-
-        FormatProcess.WaitForExit()
+    Private Sub LanguagesComboBox_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles LanguagesComboBox.SelectionChanged
+        'Set the selected language from the combobox
+        If LanguagesComboBox.SelectedItem IsNot Nothing And e.AddedItems(0) IsNot Nothing Then
+            Try
+                Dim NewLanguage As String = e.AddedItems(0).ToString
+                ConfigFile.WriteValue("Config", "Language", NewLanguage)
+                LanguageConfig = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\languages\" + NewLanguage + ".ini")
+                ChangeUILanguage()
+            Catch ex As Exception
+                MsgBox("Error setting custom language. Please check your file.", MsgBoxStyle.Critical, "Error")
+            End Try
+        End If
     End Sub
 
+#Region "Drive Selection"
+
+    Private Sub DriveList1_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles DriveList1.SelectionChanged
+        If DriveList1.SelectedItem IsNot Nothing And e.AddedItems(0) IsNot Nothing Then
+            Try
+                Dim SelectedDriveLetter As String = e.AddedItems(0).ToString().Split(CChar(vbTab))(0)
+                SelectedDrive = New DriveInfo(SelectedDriveLetter)
+            Catch ex As Exception
+                MsgBox(LanguageConfig.ReadValue("Errors", "DriveInformationError"))
+            End Try
+        End If
+    End Sub
+
+    Private Sub DriveList2_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles DriveList2.SelectionChanged
+        If DriveList2.SelectedItem IsNot Nothing And e.AddedItems(0) IsNot Nothing Then
+            Try
+                Dim SelectedDriveLetter As String = e.AddedItems(0).ToString().Split(CChar(vbTab))(0)
+                SelectedDrive = New DriveInfo(SelectedDriveLetter)
+            Catch ex As Exception
+                MsgBox(LanguageConfig.ReadValue("Errors", "DriveInformationError"))
+            End Try
+        End If
+    End Sub
+
+#End Region
+
+#Region "Subs"
+
     Private Sub CreateDirectories()
         'Create Games folder
         Directory.CreateDirectory(SelectedDrive.Name + "Games")
@@ -97,22 +181,44 @@ Class MainWindow
     End Sub
 
     Private Sub CreateUSBAutorun()
+        'Check if SelectedDrive is actually set
+        If SelectedDrive IsNot Nothing Then
+            'Double check if the name contains "\" and still exists
+            If SelectedDrive.Name.EndsWith("\") And Directory.Exists(SelectedDrive.Name) Then
+
+                If Not File.Exists(SelectedDrive.Name + "autorun.inf") Then
+                    'Create an autorun file on the USB
+                    Using AutorunWriter As New StreamWriter(SelectedDrive.Name + "autorun.inf", False, Encoding.UTF8)
+                        AutorunWriter.WriteLine("[autorun]")
+                        AutorunWriter.WriteLine("Label=XboxMediaUSBv2")
+                        AutorunWriter.WriteLine("Icon=xbox.ico")
+                    End Using
+
+                    'Hide the autorun
+                    File.SetAttributes(SelectedDrive.Name + "autorun.inf", FileAttributes.Hidden)
+                Else
+                    MsgBox("Autorun already exists.", MsgBoxStyle.Information)
+                End If
+
+                If Not File.Exists(SelectedDrive.Name + "xbox.ico") Then
+                    'Save the icon to the USB
+                    If Assembly.GetExecutingAssembly().GetManifestResourceStream("XboxMediaUSB.xbox.ico") IsNot Nothing Then
+                        Using IconFile As FileStream = File.Create(SelectedDrive.Name + "xbox.ico")
+                            Assembly.GetExecutingAssembly().GetManifestResourceStream("XboxMediaUSB.xbox.ico").CopyTo(IconFile)
+                        End Using
+                        File.SetAttributes(SelectedDrive.Name + "xbox.ico", FileAttributes.Hidden)
+                    Else
+                        If File.Exists(My.Computer.FileSystem.CurrentDirectory + "\xbox.ico") Then
+                            File.Copy(My.Computer.FileSystem.CurrentDirectory + "\xbox.ico", SelectedDrive.Name + "xbox.ico", True)
+                        End If
+                        File.SetAttributes(SelectedDrive.Name + "xbox.ico", FileAttributes.Hidden)
+                    End If
+                Else
+                    MsgBox("Icon already exists.", MsgBoxStyle.Information)
+                End If
 
-        'Create an autorun file on the USB
-        Using AutorunWriter As New StreamWriter(SelectedDrive.Name + "autorun.inf")
-            AutorunWriter.WriteLine("[autorun]")
-            AutorunWriter.WriteLine("Label=XboxMediaUSB v2")
-            AutorunWriter.WriteLine("Icon=xbox.ico")
-        End Using
-
-        'Save the icon to the USB
-        Using IconFile As FileStream = File.Create(SelectedDrive.Name + "xbox.ico")
-            Assembly.GetExecutingAssembly().GetManifestResourceStream("XboxMediaUSB.xbox.ico").CopyTo(IconFile)
-        End Using
-
-        'Hide the files
-        File.SetAttributes(SelectedDrive.Name + "autorun.inf", FileAttributes.Hidden)
-        File.SetAttributes(SelectedDrive.Name + "xbox.ico", FileAttributes.Hidden)
+            End If
+        End If
     End Sub
 
     Private Sub CheckConfigAndLanguage()
@@ -120,7 +226,7 @@ Class MainWindow
         If Not File.Exists(My.Computer.FileSystem.CurrentDirectory + "\config.ini") Then
             Using ConfigFileWriter As New StreamWriter(My.Computer.FileSystem.CurrentDirectory + "\config.ini", False, Encoding.GetEncoding("ISO-8859-1"))
                 ConfigFileWriter.WriteLine("[Config]")
-                ConfigFileWriter.WriteLine("Language=EN.ini")
+                ConfigFileWriter.WriteLine("Language=EN")
             End Using
         End If
 
@@ -188,74 +294,94 @@ Class MainWindow
         LanguagesMenuItem.Header = LanguageConfig.ReadValue("Interface", "Language")
     End Sub
 
-    Private Sub FormatUSBButton_Click(sender As Object, e As RoutedEventArgs) Handles FormatUSBButton.Click
+#End Region
 
-        If DriveList1.SelectedItem IsNot Nothing Then
+#Region "Button Actions"
+
+    Private Sub FormatUSBButton_Click(sender As Object, e As RoutedEventArgs) Handles FormatUSBButton.Click
+        If DriveList1.SelectedItem IsNot Nothing And SelectedDrive IsNot Nothing Then
             If MsgBox(LanguageConfig.ReadValue("Messages", "FormatConfirmationLine1") + " " + SelectedDrive.Name + " ?" + vbNewLine +
-            LanguageConfig.ReadValue("Messages", "FormatConfirmationLine2"), MsgBoxStyle.YesNo, LanguageConfig.ReadValue("Messages", "FormatConfirmation")) = MsgBoxResult.Yes Then
+            LanguageConfig.ReadValue("Messages", "FormatConfirmationLine2"),
+                      MsgBoxStyle.YesNo, LanguageConfig.ReadValue("Messages", "FormatConfirmation")) = MsgBoxResult.Yes Then
 
-                MainWin.Height = 470
+                If Dispatcher.CheckAccess() = False Then
+                    Dispatcher.BeginInvoke(Sub()
+                                               MainWin.Height = 470
 
-                'Show status and disable Start button
-                StatusTextBlock.Visibility = Visibility.Visible
-                StatusProgressBar.Visibility = Visibility.Visible
+                                               'Show status and disable Start button
+                                               StatusTextBlock.Visibility = Visibility.Visible
+                                               StatusProgressBar.Visibility = Visibility.Visible
 
-                FormatUSBButton.IsEnabled = False
-                AddPermissionsButton.IsEnabled = False
+                                               FormatUSBButton.IsEnabled = False
+                                               AddPermissionsButton.IsEnabled = False
+                                               SetUSBInfosButton.IsEnabled = False
 
-                StatusTextBlock.Text = LanguageConfig.ReadValue("Messages", "FormattingDrive") + " " + SelectedDrive.Name
+                                               StatusTextBlock.Text = LanguageConfig.ReadValue("Messages", "FormattingDrive") + " " + SelectedDrive.Name
 
-                Cursor = Cursors.Wait
-                StatusProgressBar.IsIndeterminate = True
+                                               Cursor = Cursors.Wait
+                                               StatusProgressBar.IsIndeterminate = True
+                                           End Sub)
+                Else
+                    MainWin.Height = 470
+
+                    'Show status and disable Start button
+                    StatusTextBlock.Visibility = Visibility.Visible
+                    StatusProgressBar.Visibility = Visibility.Visible
+
+                    FormatUSBButton.IsEnabled = False
+                    AddPermissionsButton.IsEnabled = False
+                    SetUSBInfosButton.IsEnabled = False
+
+                    StatusTextBlock.Text = LanguageConfig.ReadValue("Messages", "FormattingDrive") + " " + SelectedDrive.Name
+
+                    Cursor = Cursors.Wait
+                    StatusProgressBar.IsIndeterminate = True
+                End If
 
                 FormatWorker.RunWorkerAsync()
             End If
+        Else
+            MsgBox("Please select a drive first", MsgBoxStyle.Exclamation)
         End If
-
     End Sub
 
     Private Sub AddPermissionsButton_Click(sender As Object, e As RoutedEventArgs) Handles AddPermissionsButton.Click
-        If DriveList2.SelectedItem IsNot Nothing Then
+        If DriveList2.SelectedItem IsNot Nothing And SelectedDrive IsNot Nothing Then
             PermissionWorker.RunWorkerAsync()
         Else
-            MsgBox(LanguageConfig.ReadValue("Errors", "CouldNotSetPermissions"))
+            MsgBox("Please select a drive first", MsgBoxStyle.Exclamation)
         End If
     End Sub
 
-    Private Sub DriveList1_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles DriveList1.SelectionChanged
-        If DriveList1.SelectedItem IsNot Nothing Then
-            Try
-                Dim SelectedDriveItem As String = e.AddedItems(0).ToString
-                SelectedDrive = New DriveInfo(SelectedDriveItem.Split(vbTab)(0))
-            Catch ex As Exception
-                MsgBox(LanguageConfig.ReadValue("Errors", "DriveInformationError"))
-            End Try
+    Private Sub SetUSBInfosButton_Click(sender As Object, e As RoutedEventArgs) Handles SetUSBInfosButton.Click
+        If DriveList2.SelectedItem IsNot Nothing And SelectedDrive IsNot Nothing Then
+            CreateUSBAutorun()
+        Else
+            MsgBox("Please select a drive first", MsgBoxStyle.Exclamation)
         End If
     End Sub
 
-    Private Sub DriveList2_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles DriveList2.SelectionChanged
-        If DriveList2.SelectedItem IsNot Nothing Then
-            Try
-                Dim SelectedDriveItem As String = e.AddedItems(0).ToString
-                SelectedDrive = New DriveInfo(SelectedDriveItem.Split(vbTab)(0))
-            Catch ex As Exception
-                MsgBox(LanguageConfig.ReadValue("Errors", "DriveInformationError"))
-            End Try
-        End If
-    End Sub
+#End Region
+
+#Region "BackgroundWorker Events"
 
     Private Sub PermissionWorker_DoWork(sender As Object, e As DoWorkEventArgs) Handles PermissionWorker.DoWork
         Try
-            Dim AllApplicationPackagesUser As New Security.Principal.SecurityIdentifier("S-1-15-2-1")
-            Dim SecurityRule As New Security.AccessControl.FileSystemAccessRule(AllApplicationPackagesUser,
-                                                                                Security.AccessControl.FileSystemRights.FullControl,
-                                                                                Security.AccessControl.InheritanceFlags.ContainerInherit Or Security.AccessControl.InheritanceFlags.ObjectInherit,
-                                                                                Security.AccessControl.PropagationFlags.None,
-                                                                                Security.AccessControl.AccessControlType.Allow)
-            Dim CurrentDirPermissions As Security.AccessControl.DirectorySecurity = Directory.GetAccessControl(SelectedDrive.Name)
+            Dim AllApplicationPackagesUser As New SecurityIdentifier("S-1-15-2-1")
+            Dim CurrentDirPermissions As DirectorySecurity = Directory.GetAccessControl(SelectedDrive.Name)
+            Dim SecurityRule As New FileSystemAccessRule(AllApplicationPackagesUser,
+                                                         FileSystemRights.FullControl,
+                                                         InheritanceFlags.ContainerInherit Or InheritanceFlags.ObjectInherit,
+                                                         PropagationFlags.None,
+                                                         AccessControlType.Allow)
             CurrentDirPermissions.AddAccessRule(SecurityRule)
 
-            Directory.SetAccessControl(SelectedDrive.Name, CurrentDirPermissions)
+            If Dispatcher.CheckAccess() = False Then
+                Dispatcher.BeginInvoke(Sub() Directory.SetAccessControl(SelectedDrive.Name, CurrentDirPermissions))
+            Else
+                Directory.SetAccessControl(SelectedDrive.Name, CurrentDirPermissions)
+            End If
+
         Catch ex As Exception
             MsgBox(LanguageConfig.ReadValue("Errors", "CouldNotSetPermissions") + " " + SelectedDrive.Name)
         End Try
@@ -263,48 +389,103 @@ Class MainWindow
 
     Private Sub PermissionWorker_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles PermissionWorker.RunWorkerCompleted
         If StatusTextBlock.Dispatcher.CheckAccess() = False Then
-            StatusTextBlock.Dispatcher.BeginInvoke(New UpdateTextStatusDelegate(AddressOf TextDelegateMethod), "")
+            StatusTextBlock.Dispatcher.BeginInvoke(Sub() StatusTextBlock.Text = "")
         Else
             StatusTextBlock.Text = ""
         End If
 
-        If MainWin.Height = 470 Then
-            MainWin.Height = 435
+        If MainWin.Dispatcher.CheckAccess() = False Then
+            MainWin.Dispatcher.BeginInvoke(Sub()
+                                               If MainWin.Height = 470 Then
+                                                   MainWin.Height = 435
+                                               End If
+                                           End Sub)
+        Else
+            If MainWin.Height = 470 Then
+                MainWin.Height = 435
+            End If
+        End If
+
+        If Dispatcher.CheckAccess() = False Then
+            Dispatcher.BeginInvoke(Sub()
+                                       FormatUSBButton.IsEnabled = True
+                                       AddPermissionsButton.IsEnabled = True
+                                       SetUSBInfosButton.IsEnabled = True
+                                       Cursor = Cursors.Arrow
+                                   End Sub)
+        Else
+            FormatUSBButton.IsEnabled = True
+            AddPermissionsButton.IsEnabled = True
+            SetUSBInfosButton.IsEnabled = True
+            Cursor = Cursors.Arrow
         End If
 
         MsgBox(SelectedDrive.Name + " " + LanguageConfig.ReadValue("Messages", "PreparedforXbox"), MsgBoxStyle.Information)
-        FormatUSBButton.IsEnabled = True
     End Sub
 
     Private Sub FormatWorker_DoWork(sender As Object, e As DoWorkEventArgs) Handles FormatWorker.DoWork
         Try
-            FormatDrive()
+            'Set format process start infos
+            Dim FormatStartInfo As New ProcessStartInfo With {
+            .FileName = "format.com",
+            .Arguments = SelectedDrive.Name.Remove(2) + " /fs:NTFS /v:XboxMediaUSBv2 /q", .UseShellExecute = False, .CreateNoWindow = True, .RedirectStandardOutput = True, .RedirectStandardInput = True}
+
+            'Start format
+            Using FormatProcess As New Process With {.StartInfo = FormatStartInfo}
+                FormatProcess.Start()
+
+                'Confirm the format process
+                Dim ProcessInputStream As StreamWriter = FormatProcess.StandardInput
+                ProcessInputStream.Write(vbCr & vbLf)
+
+                'Wait until done
+                FormatProcess.WaitForExit()
+            End Using
+
         Catch ex As Exception
             MsgBox(LanguageConfig.ReadValue("Errors", "CouldNotFormat") + " " + SelectedDrive.Name, MsgBoxStyle.Critical, "Error")
         End Try
     End Sub
 
     Private Sub FormatWorker_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles FormatWorker.RunWorkerCompleted
-        Cursor = Cursors.Arrow
 
+        'Format succeeded message
         If StatusTextBlock.Dispatcher.CheckAccess() = False Then
-            StatusTextBlock.Dispatcher.BeginInvoke(New UpdateTextStatusDelegate(AddressOf TextDelegateMethod), SelectedDrive.Name + " " + LanguageConfig.ReadValue("Messages", "FormatSucceeded"))
+            StatusTextBlock.Dispatcher.BeginInvoke(Sub() StatusTextBlock.Text = SelectedDrive.Name + " " + LanguageConfig.ReadValue("Messages", "FormatSucceeded"))
         Else
             StatusTextBlock.Text = SelectedDrive.Name + " " + LanguageConfig.ReadValue("Messages", "FormatSucceeded")
         End If
 
-        StatusProgressBar.Visibility = Visibility.Hidden
+        'Hide format progressbar
+        If StatusProgressBar.Dispatcher.CheckAccess() = False Then
+            StatusProgressBar.Dispatcher.BeginInvoke(Sub() StatusProgressBar.Visibility = Visibility.Hidden)
+        Else
+            StatusProgressBar.Visibility = Visibility.Hidden
+        End If
 
+        'Create folders if CreateDefaultFoldersCheckBox is checked
         If CreateDefaultFoldersCheckBox.IsChecked Then
+            If StatusTextBlock.Dispatcher.CheckAccess() = False Then
+                StatusTextBlock.Dispatcher.BeginInvoke(Sub() StatusTextBlock.Text = "Creating directories")
+            Else
+                StatusTextBlock.Text = "Creating directories"
+            End If
             CreateDirectories()
         End If
 
+        'Create autorun with icon if SetUSBIconCheckBox is checked
         If SetUSBIconCheckBox.IsChecked Then
+            If StatusTextBlock.Dispatcher.CheckAccess() = False Then
+                StatusTextBlock.Dispatcher.BeginInvoke(Sub() StatusTextBlock.Text = "Creating autorun")
+            Else
+                StatusTextBlock.Text = "Creating autorun"
+            End If
             CreateUSBAutorun()
         End If
 
+        'Set drive permissions
         If StatusTextBlock.Dispatcher.CheckAccess() = False Then
-            StatusTextBlock.Dispatcher.BeginInvoke(New UpdateTextStatusDelegate(AddressOf TextDelegateMethod), LanguageConfig.ReadValue("Messages", "SettingPermissions") + " " + SelectedDrive.Name)
+            StatusTextBlock.Dispatcher.BeginInvoke(Sub() StatusTextBlock.Text = LanguageConfig.ReadValue("Messages", "SettingPermissions") + " " + SelectedDrive.Name)
         Else
             StatusTextBlock.Text = LanguageConfig.ReadValue("Messages", "SettingPermissions") + " " + SelectedDrive.Name
         End If
@@ -312,105 +493,33 @@ Class MainWindow
         PermissionWorker.RunWorkerAsync()
     End Sub
 
-    Private Sub MainWindow_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
-        'Set Window Title and add current version
-        Dim VersionString As String = String.Format("{0}.{1}", My.Application.Info.Version.Major, My.Application.Info.Version.Minor)
-        Title = "XboxMediaUSB v" + VersionString
-
-        'Load config file if exists
-        If File.Exists(My.Computer.FileSystem.CurrentDirectory + "\config.ini") And File.Exists(My.Computer.FileSystem.CurrentDirectory + "\languages\EN.ini") Then
-            ConfigFile = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\config.ini") 'Set the general config file
-
-            If Not ConfigFile.ReadValue("Config", "Language") = "" Then 'Check if any language is set in the config file
-                CurrentLanguage = ConfigFile.ReadValue("Config", "Language") 'Set the language
-
-                If Not CurrentLanguage = "EN.ini" Then 'If it's not English then change the language
-                    LanguageConfig = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\languages\" + CurrentLanguage) 'Set the language config file
-                    ChangeUILanguage()
-                Else
-                    LanguageConfig = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\languages\EN.ini") 'Required for dialog strings
-                End If
-
-            Else
-                ConfigFile.WriteValue("Config", "Language", "EN") 'Set the key if no language is set
-                LanguageConfig = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\languages\EN.ini")
-            End If
-
-        Else 'Config file and language folder do not exist
-            CheckConfigAndLanguage()
-            ConfigFile = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\config.ini") 'Set the general config file
-            CurrentLanguage = "EN" 'Set the language
-            LanguageConfig = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\languages\EN.ini") 'Set language config
-        End If
-
-        'List removable and fixed drives in 'Ready' state
-        For Each Drive As DriveInfo In DriveInfo.GetDrives()
-            If Drive.DriveType = DriveType.Removable And Drive.IsReady Or DriveType.Fixed And Drive.IsReady Then
-                DriveList1.Items.Add(Drive.Name + vbTab + Drive.VolumeLabel)
-                DriveList2.Items.Add(Drive.Name + vbTab + Drive.VolumeLabel)
-            End If
-        Next
-
-        'Add all available languages from 'languages' directory to a combobox (in case you want to load a language that has not been added yet)
-        For Each Language As String In Directory.GetFiles(My.Computer.FileSystem.CurrentDirectory + "\languages", "*.ini")
-            Dim LanguageFileInfo As New FileInfo(Language)
-            LanguagesComboBox.Items.Add(LanguageFileInfo.Name)
-        Next
-    End Sub
-
-    Private Sub LanguagesComboBox_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles LanguagesComboBox.SelectionChanged
-        'Set the selected language from the combobox
-        If LanguagesComboBox.SelectedItem IsNot Nothing Then
-            Try
-                Dim NewLanguage As String = e.AddedItems(0).ToString
-                ConfigFile.WriteValue("Config", "Language", NewLanguage)
-                LanguageConfig = New INI.IniFile(My.Computer.FileSystem.CurrentDirectory + "\languages\" + NewLanguage)
-                ChangeUILanguage()
-            Catch ex As Exception
-                MsgBox("Error setting custom language. Please check your file.", MsgBoxStyle.Critical, "Error")
-            End Try
-        End If
-    End Sub
-
-    Private Sub SetUSBInfosButton_Click(sender As Object, e As RoutedEventArgs) Handles SetUSBInfosButton.Click
-        CreateUSBAutorun()
-    End Sub
+#End Region
 
 End Class
 
 Namespace INI
-
     Public Class IniFile
         Public IniPath As String
 
-        <DllImport("kernel32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> Private Shared Function WritePrivateProfileString(ByVal lpAppName As String,
-                        ByVal lpKeyName As String,
-                        ByVal lpString As String,
-                        ByVal lpFileName As String) As Boolean
+        <DllImport("kernel32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> Private Shared Function WritePrivateProfileString(lpAppName As String, lpKeyName As String, lpString As String, lpFileName As String) As Boolean
         End Function
 
-        <DllImport("kernel32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> Private Shared Function GetPrivateProfileString(ByVal lpAppName As String,
-                        ByVal lpKeyName As String,
-                        ByVal lpDefault As String,
-                        ByVal lpReturnedString As StringBuilder,
-                        ByVal nSize As Integer,
-                        ByVal lpFileName As String) As Integer
+        <DllImport("kernel32.dll", SetLastError:=True, CharSet:=CharSet.Auto)> Private Shared Function GetPrivateProfileString(lpAppName As String, lpKeyName As String, lpDefault As String, lpReturnedString As StringBuilder, nSize As Integer, lpFileName As String) As Integer
         End Function
 
-        Public Sub New(ByVal INIPathValue As String)
+        Public Sub New(INIPathValue As String)
             IniPath = INIPathValue
         End Sub
 
-        Public Sub WriteValue(ByVal Section As String, ByVal Key As String, ByVal Value As String)
+        Public Sub WriteValue(Section As String, Key As String, Value As String)
             WritePrivateProfileString(Section, Key, Value, IniPath)
         End Sub
 
-        Public Function ReadValue(ByVal Section As String, ByVal Key As String) As String
+        Public Function ReadValue(Section As String, Key As String) As String
             Dim res As Integer
             Dim sb As New StringBuilder(255)
             res = GetPrivateProfileString(Section, Key, "", sb, sb.Capacity, IniPath)
             Return sb.ToString()
         End Function
     End Class
-
 End Namespace
\ No newline at end of file
diff --git a/Newest/XboxMediaUSB-N/My Project/AssemblyInfo.vb b/Newest/XboxMediaUSB-N/My Project/AssemblyInfo.vb
index ba863cc..fec019a 100644
--- a/Newest/XboxMediaUSB-N/My Project/AssemblyInfo.vb	
+++ b/Newest/XboxMediaUSB-N/My Project/AssemblyInfo.vb	
@@ -12,8 +12,8 @@ Imports System.Windows
 ' Review the values of the assembly attributes
 
 <Assembly: AssemblyTitle("XboxMediaUSB")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
+<Assembly: AssemblyDescription("Creates a new drive for Xbox consoles or adds missing permissions.")>
+<Assembly: AssemblyCompany("SvenGDK")>
 <Assembly: AssemblyProduct("XboxMediaUSB")>
 <Assembly: AssemblyCopyright("Copyright © SvenGDK 2022-2023")>
 <Assembly: AssemblyTrademark("")>
@@ -55,5 +55,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.0.0.0")>
-<Assembly: AssemblyFileVersion("2.0.0.0")>
+<Assembly: AssemblyVersion("2.1.0.0")>
+<Assembly: AssemblyFileVersion("2.1.0.0")>
diff --git a/Newest/XboxMediaUSB-N/My Project/app.manifest b/Newest/XboxMediaUSB-N/My Project/app.manifest
index 438ee0d..be770ab 100644
--- a/Newest/XboxMediaUSB-N/My Project/app.manifest	
+++ b/Newest/XboxMediaUSB-N/My Project/app.manifest	
@@ -4,76 +4,13 @@
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
     <security>
       <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
-        <!-- UAC Manifest Options
-             If you want to change the Windows User Account Control level replace the 
-             requestedExecutionLevel node with one of the following.
-
-        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
-        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
-        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
-
-            Specifying requestedExecutionLevel element will disable file and registry virtualization. 
-            Remove this element if your application requires this virtualization for backwards
-            compatibility.
-        -->
-        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel level="highestAvailable" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-    <application>
-      <!-- A list of the Windows versions that this application has been tested on
-           and is designed to work with. Uncomment the appropriate elements
-           and Windows will automatically select the most compatible environment. -->
-
-      <!-- Windows Vista -->
-      <!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
-
-      <!-- Windows 7 -->
-      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
-
-      <!-- Windows 8 -->
-      <!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
-
-      <!-- Windows 8.1 -->
-      <!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
-
-      <!-- Windows 10 -->
-      <!--<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />-->
-
-    </application>
+    <application/>
   </compatibility>
 
-  <!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
-       DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need 
-       to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should 
-       also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. 
-       
-       Makes the application long-path aware. See https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
-  <!--
-  <application xmlns="urn:schemas-microsoft-com:asm.v3">
-    <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-      <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
-    </windowsSettings>
-  </application>
-  -->
-
-  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
-  <!--
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity
-          type="win32"
-          name="Microsoft.Windows.Common-Controls"
-          version="6.0.0.0"
-          processorArchitecture="*"
-          publicKeyToken="6595b64144ccf1df"
-          language="*"
-        />
-    </dependentAssembly>
-  </dependency>
-  -->
-
 </assembly>
diff --git a/Newest/XboxMediaUSB-N/XboxMediaUSB-N.vbproj b/Newest/XboxMediaUSB-N/XboxMediaUSB-N.vbproj
index a96decb..3c61977 100644
--- a/Newest/XboxMediaUSB-N/XboxMediaUSB-N.vbproj
+++ b/Newest/XboxMediaUSB-N/XboxMediaUSB-N.vbproj
@@ -8,10 +8,11 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>XboxMediaUSB</RootNamespace>
     <AssemblyName>XboxMediaUSB</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
     <MyType>Custom</MyType>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -23,8 +24,10 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DocumentationFile>
     </DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <NoWarn>
+    </NoWarn>
     <Prefer32Bit>true</Prefer32Bit>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -37,7 +40,9 @@
     <OutputPath>bin\Release\</OutputPath>
     <DocumentationFile>
     </DocumentationFile>
-    <NoWarn>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314</NoWarn>
+    <NoWarn>
+    </NoWarn>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
@@ -46,7 +51,7 @@
     <OptionCompare>Binary</OptionCompare>
   </PropertyGroup>
   <PropertyGroup>
-    <OptionStrict>Off</OptionStrict>
+    <OptionStrict>On</OptionStrict>
   </PropertyGroup>
   <PropertyGroup>
     <OptionInfer>On</OptionInfer>
@@ -59,30 +64,37 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'x64|AnyCPU'">
     <OutputPath>bin\x64\</OutputPath>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Debug\</OutputPath>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Release\</OutputPath>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'x64|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\x64\</OutputPath>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
     <PlatformTarget>ARM64</PlatformTarget>
     <OutputPath>bin\ARM64\Debug\</OutputPath>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
     <PlatformTarget>ARM64</PlatformTarget>
     <OutputPath>bin\ARM64\Release\</OutputPath>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'x64|ARM64'">
     <PlatformTarget>ARM64</PlatformTarget>
     <OutputPath>bin\ARM64\x64\</OutputPath>
+    <WarningsAsErrors>41999,42016,42017,42018,42019,42020,42021,42022,42032,42036</WarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System.Core" />
@@ -170,7 +182,9 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="permissions.png" />
-    <EmbeddedResource Include="xbox.ico" />
+    <EmbeddedResource Include="xbox.ico">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </EmbeddedResource>
     <Resource Include="xboxusb.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
diff --git a/Newest/XboxMediaUSB-N/bin/Debug/config.ini b/Newest/XboxMediaUSB-N/bin/Debug/config.ini
deleted file mode 100644
index 86d6d53..0000000
--- a/Newest/XboxMediaUSB-N/bin/Debug/config.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Config]
-Language=DE.ini
diff --git a/Newest/XboxMediaUSB-N/bin/Debug/languages/DE.ini b/Newest/XboxMediaUSB-N/bin/Debug/languages/DE.ini
deleted file mode 100644
index ece1445..0000000
--- a/Newest/XboxMediaUSB-N/bin/Debug/languages/DE.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[Interface]
-Welcome=Willkommen zu XboxMediaUSB !
-PrepareGroupBox=Neues Laufwerk erstellen
-SelectLabel1=Wähle ein Laufwerk zum formatieren :
-SelectLabel2=Wähle ein Laufwerk aus der Liste :
-WarningLabel=Warnung: Alle Daten auf dem Laufwerk werden gelöscht!
-StartButton=Formatieren
-SetPermissionGroupBox=Bestehendes Laufwerk ändern
-SetPermissionsButton=Rechte hinzufügen
-Options=Optionen :
-CreateDefaultFolders=Zusätzliche Ordner erstellen
-SetUSBIcon=USB Icon anpassen
-Settings=Einstellungen
-Language=Sprache
-
-[Messages]
-FormatSucceeded=formatiert!
-CreateDefaultFolders=Möchten sie den "Games", "BIOS" und "RetroArch" Ordner auf dem neuen Laufwerk erstellen ?
-SettingPermissions=Berechtigungen für 'ALL APPLICATION PACKAGES' werden gesetzt auf
-PreparedforXbox=ist jetzt für deine Xbox vorbereitet.
-FormatConfirmation=Bitte bestätigen
-FormatConfirmationLine1=Möchten sie wirklich das folgende Laufwerk formatieren:
-FormatConfirmationLine2=Alle Daten auf dem Laufwerk werden gelöscht.
-FormattingDrive=Formatiere Laufwerk
-
-[Errors]
-DriveInformationError=Fehler beim Abrufen der Laufwerksinformationen für
-CouldNotFormat=Fehler beim formatieren des Laufwerks
-CouldNotSetPermissions=Berechtigungen für 'ALL APPLICATION PACKAGES' konnten nicht gesetzt werden auf
-SelectDriveFirst=Bitte ein Laufwerk aus der Liste auswählen
\ No newline at end of file
diff --git a/Newest/XboxMediaUSB-N/bin/Debug/languages/EN.ini b/Newest/XboxMediaUSB-N/bin/Debug/languages/EN.ini
deleted file mode 100644
index 7139aae..0000000
--- a/Newest/XboxMediaUSB-N/bin/Debug/languages/EN.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[Interface]
-Welcome=Welcome to XboxMediaUSB !
-PrepareGroupBox=Prepare new a USB drive
-SelectLabel1=Select a removable USB drive from the list :
-SelectLabel2=Select a removable USB drive from the list :
-WarningLabel=Warning: All Data on this drive will be erased.
-StartButton=Format USB
-SetPermissionGroupBox=Modify an exisiting USB drive
-SetPermissionsButton=Add permissions to drive
-Options=Options
-CreateDefaultFolders=Create default folders
-SetUSBIcon=Set USB drive icon
-Settings=Settings
-Language=Language
-
-[Messages]
-FormatSucceeded=formated!
-CreateDefaultFolders=Do you want to create the 'Games', 'BIOS' and 'RetroArch' folder on your new drive?
-SettingPermissions=Giving 'ALL APPLICATION PACKAGES' permissions on
-PreparedforXbox=is now prepared for your Xbox.
-FormatConfirmation=Please confirm
-FormatConfirmationLine1=Do you really want to format:
-FormatConfirmationLine2=All Data on this drive will be erased.
-FormattingDrive=Formatting drive
-
-[Errors]
-DriveInformationError=Error getting drive information
-CouldNotFormat=Could not format drive
-CouldNotSetPermissions=Could not set permission for 'ALL APPLICATION PACKAGES' on drive
-SelectDriveFirst=Please select a drive from the list first
diff --git a/Newest/XboxMediaUSB-N/bin/Debug/languages/ES.ini b/Newest/XboxMediaUSB-N/bin/Debug/languages/ES.ini
deleted file mode 100644
index 666585f..0000000
--- a/Newest/XboxMediaUSB-N/bin/Debug/languages/ES.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[Interface]
-PrepareGroupBox=Preparar un nuevo disco duro
-SelectLabel1=Selecciona el disco duro a formatear:
-SelectLabel2=Selecciona el disco duro de la lista:
-WarningLabel=ADVERTENCIA: Todos los archivos en el disco duro van a ser eliminados.
-StartButton=Comenzar
-SetPermissionGroupBox=Solo agregar permisos al disco duro (los archivos no seran borrados)
-SetPermissionsButton=Agregar permisos al disco duro
-Settings=Ajustes
-Language=Lenguaje
-
-[Messages]
-FormatSucceeded=formateado!
-CreateDefaultFolders=Quieres crear las carpetas 'Games', 'BIOS' y 'RetroArch' en tu disco duro?
-SettingPermissions=Dandole a 'ALL APPLICATION PACKAGES' permisos en
-PreparedforXbox=esta listo para tu Xbox.
-FormatConfirmation=Por favor de confirmar
-FormatConfirmationLine1=En verdad quieres formatear:
-FormatConfirmationLine2=Todos los archivos en el disco duro van a ser eliminados.
-FormattingDrive=Formateando disco duro
-
-[Errors]
-DriveInformationError=Error en obtener la información sobre
-CouldNotFormat=No se pudo formatear el disco duro
-CouldNotSetPermissions=No se le pudo dar permisos a 'ALL APPLICATION PACKAGES' en el disco duro
-SelectDriveFirst=Por favor selecciona un disco duro de la lista primero
diff --git a/Newest/XboxMediaUSB-N/bin/Debug/languages/FR.ini b/Newest/XboxMediaUSB-N/bin/Debug/languages/FR.ini
deleted file mode 100644
index 114a185..0000000
--- a/Newest/XboxMediaUSB-N/bin/Debug/languages/FR.ini
+++ /dev/null
@@ -1,30 +0,0 @@
-[Interface]
-Welcome=Bienvenue à XboxMediaUSB !
-PrepareGroupBox=Préparer un nouveau clé USB
-SelectLabel1=Sélectionnez le disque à formater :
-SelectLabel2=Sélectionnez un disque dans la liste :
-WarningLabel=Attention: Toutes les données sur l' USB seront effacées !
-StartButton=Formater
-SetPermissionGroupBox=Modifier un USB existant
-SetPermissionsButton=Ajouter l'autorisation manquante
-Options=Options :
-CreateDefaultFolders=Créer les dossiers par défaut
-SetUSBIcon=Ajouter l'icône au USB
-Settings=Paramètres
-Language=Langue
-
-[Messages]
-FormatSucceeded=formaté!
-CreateDefaultFolders=Voulez-vous créer les dossiers "Games", "BIOS" et "RetroArch" sur votre nouveau disque ?
-SettingPermissions=Configuration de l'autorisation pour 'ALL APPLICATION PACKAGES' sur
-PreparedforXbox=est maintenant préparé pour votre Xbox.
-FormatConfirmation=Veuillez confirmer
-FormatConfirmationLine1=Voulez-vous vraiment formater le disque
-FormatConfirmationLine2=Toutes les données sur le disque seront effacées.
-FormattingDrive=En train de formater
-
-[Errors]
-DriveInformationError=Erreur lors de la récupération des informations sur le lecteur
-CouldNotFormat=Erreur lors du formatage du disque
-CouldNotSetPermissions=Impossible de configurer les autorisations pour 'ALL APPLICATION PACKAGES' sur
-SelectDriveFirst=Veuillez d'abord sélectionner un disque dans la liste
\ No newline at end of file