diff --git a/CUE4Parse b/CUE4Parse
index 82c1f94f..2afe7e51 160000
--- a/CUE4Parse
+++ b/CUE4Parse
@@ -1 +1 @@
-Subproject commit 82c1f94f607446d02f8b6f559e6fd0124642259c
+Subproject commit 2afe7e511319e20491d9e79ab0405b57252838ac
diff --git a/FModel/Creator/Utils.cs b/FModel/Creator/Utils.cs
index 966d50c4..e3510a4c 100644
--- a/FModel/Creator/Utils.cs
+++ b/FModel/Creator/Utils.cs
@@ -11,6 +11,7 @@ using CUE4Parse.Utils;
 using CUE4Parse_Conversion.Textures;
 using FModel.Framework;
 using FModel.Services;
+using FModel.Settings;
 using FModel.ViewModels;
 using SkiaSharp;
 using SkiaSharp.HarfBuzz;
@@ -105,7 +106,7 @@ namespace FModel.Creator
         public static SKBitmap GetB64Bitmap(string b64) => SKBitmap.Decode(new MemoryStream(Convert.FromBase64String(b64)) {Position = 0});
         public static SKBitmap GetBitmap(FSoftObjectPath softObjectPath) => GetBitmap(softObjectPath.AssetPathName.Text);
         public static SKBitmap GetBitmap(string fullPath) => TryLoadObject(fullPath, out UTexture2D texture) ? GetBitmap(texture) : null;
-        public static SKBitmap GetBitmap(UTexture2D texture) => texture.IsVirtual ? null : texture.Decode();
+        public static SKBitmap GetBitmap(UTexture2D texture) => texture.IsVirtual ? null : texture.Decode(UserSettings.Default.OverridedPlatform);
         public static SKBitmap GetBitmap(byte[] data) => SKBitmap.Decode(data);
 
         public static SKBitmap ResizeWithRatio(this SKBitmap me, double width, double height)
diff --git a/FModel/Settings/UserSettings.cs b/FModel/Settings/UserSettings.cs
index 28041f15..1fc8393e 100644
--- a/FModel/Settings/UserSettings.cs
+++ b/FModel/Settings/UserSettings.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Windows;
 using System.Windows.Input;
+using CUE4Parse.UE4.Assets.Exports.Texture;
 using CUE4Parse.UE4.Objects.Core.Serialization;
 using CUE4Parse.UE4.Versions;
 using CUE4Parse_Conversion.Meshes;
@@ -251,6 +252,13 @@ namespace FModel.Settings
             set => SetProperty(ref _manualGames, value);
         }
 
+        private ETexturePlatform _overridedPlatform = ETexturePlatform.DesktopMobile;
+        public ETexturePlatform OverridedPlatform
+        {
+            get => _overridedPlatform;
+            set => SetProperty(ref _overridedPlatform, value);
+        }
+
         private IDictionary<FGame, string> _presets = new Dictionary<FGame, string>
         {
             {FGame.Unknown, Constants._NO_PRESET_TRIGGER},
diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs
index 05129e35..55914359 100644
--- a/FModel/ViewModels/CUE4ParseViewModel.cs
+++ b/FModel/ViewModels/CUE4ParseViewModel.cs
@@ -28,7 +28,6 @@ using CUE4Parse.UE4.Versions;
 using CUE4Parse.UE4.Wwise;
 using CUE4Parse_Conversion;
 using CUE4Parse_Conversion.Sounds;
-using CUE4Parse_Conversion.Textures;
 using EpicManifestParser.Objects;
 using FModel.Creator;
 using FModel.Extensions;
@@ -72,7 +71,7 @@ namespace FModel.ViewModels
         public SearchViewModel SearchVm { get; }
         public TabControlViewModel TabControl { get; }
         public int LocalizedResourcesCount { get; set; }
-        public bool HotfixedResourcesDone { get; set; } = false;
+        public bool HotfixedResourcesDone { get; set; }
         public int VirtualPathCount { get; set; }
 
         public CUE4ParseViewModel(string gameDirectory)
@@ -84,7 +83,7 @@ namespace FModel.ViewModels
                     Game = FGame.FortniteGame;
                     Provider = new StreamedFileProvider("FortniteLive", true,
                         new VersionContainer(
-                            UserSettings.Default.OverridedGame[Game],
+                            UserSettings.Default.OverridedGame[Game], UserSettings.Default.OverridedPlatform,
                             customVersions: UserSettings.Default.OverridedCustomVersions[Game],
                             optionOverrides: UserSettings.Default.OverridedOptions[Game]));
                     break;
@@ -94,7 +93,7 @@ namespace FModel.ViewModels
                     Game = FGame.ShooterGame;
                     Provider = new StreamedFileProvider("ValorantLive", true,
                         new VersionContainer(
-                            UserSettings.Default.OverridedGame[Game],
+                            UserSettings.Default.OverridedGame[Game], UserSettings.Default.OverridedPlatform,
                             customVersions: UserSettings.Default.OverridedCustomVersions[Game],
                             optionOverrides: UserSettings.Default.OverridedOptions[Game]));
                     break;
@@ -102,7 +101,7 @@ namespace FModel.ViewModels
                 default:
                 {
                     Game = gameDirectory.SubstringBeforeLast("\\Content").SubstringAfterLast("\\").ToEnum(FGame.Unknown);
-                    var versions = new VersionContainer(UserSettings.Default.OverridedGame[Game],
+                    var versions = new VersionContainer(UserSettings.Default.OverridedGame[Game], UserSettings.Default.OverridedPlatform,
                         customVersions: UserSettings.Default.OverridedCustomVersions[Game],
                         optionOverrides: UserSettings.Default.OverridedOptions[Game]);
 
@@ -120,7 +119,7 @@ namespace FModel.ViewModels
                         }
                         case FGame.Unknown when UserSettings.Default.ManualGames.TryGetValue(gameDirectory, out var settings):
                         {
-                            versions = new VersionContainer(settings.OverridedGame,
+                            versions = new VersionContainer(settings.OverridedGame, UserSettings.Default.OverridedPlatform,
                                 customVersions: settings.OverridedCustomVersions,
                                 optionOverrides: settings.OverridedOptions);
                             goto default;
@@ -764,7 +763,7 @@ namespace FModel.ViewModels
 
         private void SaveExport(UObject export)
         {
-            var toSave = new Exporter(export, UserSettings.Default.TextureExportFormat, UserSettings.Default.LodExportFormat, UserSettings.Default.MeshExportFormat);
+            var toSave = new Exporter(export, UserSettings.Default.TextureExportFormat, UserSettings.Default.LodExportFormat, UserSettings.Default.MeshExportFormat, UserSettings.Default.OverridedPlatform);
             var toSaveDirectory = new DirectoryInfo(UserSettings.Default.ModelDirectory);
             if (toSave.TryWriteToDir(toSaveDirectory, out var savedFileName))
             {
diff --git a/FModel/ViewModels/ModelViewerViewModel.cs b/FModel/ViewModels/ModelViewerViewModel.cs
index bb02c1ad..9686b789 100644
--- a/FModel/ViewModels/ModelViewerViewModel.cs
+++ b/FModel/ViewModels/ModelViewerViewModel.cs
@@ -186,7 +186,7 @@ namespace FModel.ViewModels
             {
                 foreach (var model in _loadedModels)
                 {
-                    var toSave = new CUE4Parse_Conversion.Exporter(model.Export, UserSettings.Default.TextureExportFormat, UserSettings.Default.LodExportFormat, UserSettings.Default.MeshExportFormat);
+                    var toSave = new CUE4Parse_Conversion.Exporter(model.Export, UserSettings.Default.TextureExportFormat, UserSettings.Default.LodExportFormat, UserSettings.Default.MeshExportFormat, UserSettings.Default.OverridedPlatform);
                     if (toSave.TryWriteToDir(new DirectoryInfo(folderBrowser.SelectedPath), out var savedFileName))
                     {
                         Log.Information("Successfully saved {FileName}", savedFileName);
@@ -419,19 +419,35 @@ namespace FModel.ViewModels
                 }
                 else if (parameters.Diffuse is UTexture2D diffuse)
                 {
-                    m.AlbedoMap = new TextureModel(diffuse.Decode()?.Encode(SKEncodedImageFormat.Png, 100).AsStream());
+                    m.AlbedoMap = new TextureModel(diffuse.Decode(UserSettings.Default.OverridedPlatform)?.Encode(SKEncodedImageFormat.Png, 100).AsStream());
                 }
 
                 if (parameters.Normal is UTexture2D normal)
                 {
-                    m.NormalMap = new TextureModel(normal.Decode()?.Encode(SKEncodedImageFormat.Png, 100).AsStream());
+                    m.NormalMap = new TextureModel(normal.Decode(UserSettings.Default.OverridedPlatform)?.Encode(SKEncodedImageFormat.Png, 100).AsStream());
                 }
 
                 if (parameters.Specular is UTexture2D specular)
                 {
                     var mip = specular.GetFirstMip();
-                    TextureDecoder.DecodeTexture(mip, specular.Format, specular.isNormalMap,
-                        out var data, out var colorType);
+                    byte[] data;
+                    SKColorType colorType;
+                    switch (UserSettings.Default.OverridedPlatform)
+                    {
+                        case ETexturePlatform.Playstation:
+                            PlaystationDecoder.DecodeTexturePlaystation(mip, specular.Format, specular.isNormalMap,
+                                out data, out colorType);
+                            break;
+                        case ETexturePlatform.NintendoSwitch:
+                            NintendoSwitchDecoder.DecodeTextureNSW(mip, specular.Format, specular.isNormalMap,
+                                out data, out colorType);
+                            break;
+                        default:
+                            TextureDecoder.DecodeTexture(mip, specular.Format, specular.isNormalMap,
+                                out data, out colorType);
+                            break;
+                    }
+
 
                     switch (_game)
                     {
@@ -540,7 +556,7 @@ namespace FModel.ViewModels
                 if (parameters.HasTopEmissiveTexture && parameters.Emissive is UTexture2D emissive && parameters.EmissiveColor is { A: > 0 } emissiveColor)
                 {
                     m.EmissiveColor = new Color4(emissiveColor.R, emissiveColor.G, emissiveColor.B, emissiveColor.A);
-                    m.EmissiveMap = new TextureModel(emissive.Decode()?.Encode(SKEncodedImageFormat.Png, 100).AsStream());
+                    m.EmissiveMap = new TextureModel(emissive.Decode(UserSettings.Default.OverridedPlatform)?.Encode(SKEncodedImageFormat.Png, 100).AsStream());
                 }
             }
             else
diff --git a/FModel/ViewModels/SettingsViewModel.cs b/FModel/ViewModels/SettingsViewModel.cs
index 984b0b2c..85fcca67 100644
--- a/FModel/ViewModels/SettingsViewModel.cs
+++ b/FModel/ViewModels/SettingsViewModel.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Threading.Tasks;
+using CUE4Parse.UE4.Assets.Exports.Texture;
 using CUE4Parse.UE4.Objects.Core.Misc;
 using CUE4Parse.UE4.Objects.Core.Serialization;
 using CUE4Parse.UE4.Versions;
@@ -39,6 +40,13 @@ namespace FModel.ViewModels
             }
         }
 
+        private ETexturePlatform _selectedUePlatform;
+        public ETexturePlatform SelectedUePlatform
+        {
+            get => _selectedUePlatform;
+            set => SetProperty(ref _selectedUePlatform, value);
+        }
+
         private EGame _selectedUeGame;
         public EGame SelectedUeGame
         {
@@ -127,6 +135,7 @@ namespace FModel.ViewModels
         public ReadOnlyObservableCollection<EMeshFormat> MeshExportFormats { get; private set; }
         public ReadOnlyObservableCollection<ELodFormat> LodExportFormats { get; private set; }
         public ReadOnlyObservableCollection<ETextureFormat> TextureExportFormats { get; private set; }
+        public ReadOnlyObservableCollection<ETexturePlatform> Platforms { get; private set; }
 
         public bool EnableElements => SelectedPreset == Constants._NO_PRESET_TRIGGER;
 
@@ -141,6 +150,7 @@ namespace FModel.ViewModels
         private string _gameSnapshot;
         private EUpdateMode _updateModeSnapshot;
         private string _presetSnapshot;
+        private ETexturePlatform _uePlatformSnapshot;
         private EGame _ueGameSnapshot;
         private List<FCustomVersion> _customVersionsSnapshot;
         private Dictionary<string, bool> _optionsSnapshot;
@@ -167,6 +177,7 @@ namespace FModel.ViewModels
             _gameSnapshot = UserSettings.Default.GameDirectory;
             _updateModeSnapshot = UserSettings.Default.UpdateMode;
             _presetSnapshot = UserSettings.Default.Presets[_game];
+            _uePlatformSnapshot = UserSettings.Default.OverridedPlatform;
             if (_game == FGame.Unknown && UserSettings.Default.ManualGames.TryGetValue(_gameSnapshot, out var settings))
             {
                 _ueGameSnapshot = settings.OverridedGame;
@@ -188,6 +199,7 @@ namespace FModel.ViewModels
 
             SelectedUpdateMode = _updateModeSnapshot;
             SelectedPreset = _presetSnapshot;
+            SelectedUePlatform = _uePlatformSnapshot;
             SelectedUeGame = _ueGameSnapshot;
             SelectedCustomVersions = _customVersionsSnapshot;
             SelectedOptions = _optionsSnapshot;
@@ -211,6 +223,7 @@ namespace FModel.ViewModels
             MeshExportFormats = new ReadOnlyObservableCollection<EMeshFormat>(new ObservableCollection<EMeshFormat>(EnumerateMeshExportFormat()));
             LodExportFormats = new ReadOnlyObservableCollection<ELodFormat>(new ObservableCollection<ELodFormat>(EnumerateLodExportFormat()));
             TextureExportFormats = new ReadOnlyObservableCollection<ETextureFormat>(new ObservableCollection<ETextureFormat>(EnumerateTextureExportFormat()));
+            Platforms = new ReadOnlyObservableCollection<ETexturePlatform>(new ObservableCollection<ETexturePlatform>(EnumerateUePlatforms()));
         }
 
         public async Task InitPresets(string gameName)
@@ -257,8 +270,8 @@ namespace FModel.ViewModels
         {
             var ret = SettingsOut.Nothing;
 
-            if (_ueGameSnapshot != SelectedUeGame || // combobox
-                _customVersionsSnapshot != SelectedCustomVersions || _optionsSnapshot != SelectedOptions ||
+            if (_ueGameSnapshot != SelectedUeGame || _customVersionsSnapshot != SelectedCustomVersions ||
+                _uePlatformSnapshot != SelectedUePlatform || _optionsSnapshot != SelectedOptions || // combobox
                 _outputSnapshot != UserSettings.Default.OutputDirectory || // textbox
                 _rawDataSnapshot != UserSettings.Default.RawDataDirectory || // textbox
                 _propertiesSnapshot != UserSettings.Default.PropertiesDirectory || // textbox
@@ -276,6 +289,7 @@ namespace FModel.ViewModels
 
             UserSettings.Default.UpdateMode = SelectedUpdateMode;
             UserSettings.Default.Presets[_game] = SelectedPreset;
+            UserSettings.Default.OverridedPlatform = SelectedUePlatform;
             if (_game == FGame.Unknown && UserSettings.Default.ManualGames.ContainsKey(UserSettings.Default.GameDirectory))
             {
                 UserSettings.Default.ManualGames[UserSettings.Default.GameDirectory].OverridedGame = SelectedUeGame;
@@ -317,5 +331,6 @@ namespace FModel.ViewModels
         private IEnumerable<EMeshFormat> EnumerateMeshExportFormat() => Enum.GetValues<EMeshFormat>();
         private IEnumerable<ELodFormat> EnumerateLodExportFormat() => Enum.GetValues<ELodFormat>();
         private IEnumerable<ETextureFormat> EnumerateTextureExportFormat() => Enum.GetValues<ETextureFormat>();
+        private IEnumerable<ETexturePlatform> EnumerateUePlatforms() => Enum.GetValues<ETexturePlatform>();
     }
 }
diff --git a/FModel/ViewModels/TabControlViewModel.cs b/FModel/ViewModels/TabControlViewModel.cs
index 8701de51..759dd610 100644
--- a/FModel/ViewModels/TabControlViewModel.cs
+++ b/FModel/ViewModels/TabControlViewModel.cs
@@ -222,7 +222,7 @@ namespace FModel.ViewModels
             });
         }
 
-        public void AddImage(UTexture2D texture) => AddImage(texture.Name, texture.bRenderNearestNeighbor, texture.Decode());
+        public void AddImage(UTexture2D texture) => AddImage(texture.Name, texture.bRenderNearestNeighbor, texture.Decode(UserSettings.Default.OverridedPlatform));
         public void AddImage(string name, bool rnn, SKBitmap[] img)
         {
             foreach (var i in img) AddImage(name, rnn, i);
diff --git a/FModel/Views/SettingsView.xaml b/FModel/Views/SettingsView.xaml
index 2b33ae47..e0f89399 100644
--- a/FModel/Views/SettingsView.xaml
+++ b/FModel/Views/SettingsView.xaml
@@ -40,6 +40,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
                         <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
                     </Grid.RowDefinitions>
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
@@ -129,8 +130,8 @@
                               DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}" SelectionChanged="OnSelectionChanged" Margin="0 0 0 5">
                     </ComboBox>
 
-                    <TextBlock Grid.Row="8" Grid.Column="0" Text="UE Versions *" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="Override the UE version to use when parsing packages" />
-                    <ComboBox Grid.Row="8" Grid.Column="2" Grid.ColumnSpan="5" ItemsSource="{Binding SettingsView.UeGames}" SelectedItem="{Binding SettingsView.SelectedUeGame, Mode=TwoWay}"
+                    <TextBlock Grid.Row="8" Grid.Column="0" Text="Texture Platform *" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="Override the game version to ensure texture compatibility" />
+                    <ComboBox Grid.Row="8" Grid.Column="2" Grid.ColumnSpan="5" ItemsSource="{Binding SettingsView.Platforms}" SelectedItem="{Binding SettingsView.SelectedUePlatform, Mode=TwoWay}"
                               DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}" IsEnabled="{Binding SettingsView.EnableElements}"
                               Margin="0 0 0 5">
                         <ComboBox.ItemTemplate>
@@ -140,8 +141,19 @@
                         </ComboBox.ItemTemplate>
                     </ComboBox>
 
-                    <TextBlock Grid.Row="9" Grid.Column="0" Text="Versioning Configuration *" VerticalAlignment="Center" Margin="0 0 0 5" />
-                    <Grid Grid.Row="9" Grid.Column="2" Grid.ColumnSpan="5" Margin="0 0 0 5">
+                    <TextBlock Grid.Row="9" Grid.Column="0" Text="UE Versions *" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="Override the UE version to use when parsing packages" />
+                    <ComboBox Grid.Row="9" Grid.Column="2" Grid.ColumnSpan="5" ItemsSource="{Binding SettingsView.UeGames}" SelectedItem="{Binding SettingsView.SelectedUeGame, Mode=TwoWay}"
+                              DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}" IsEnabled="{Binding SettingsView.EnableElements}"
+                              Margin="0 0 0 5">
+                        <ComboBox.ItemTemplate>
+                            <DataTemplate>
+                                <TextBlock Text="{Binding Converter={x:Static converters:EnumToStringConverter.Instance}}" />
+                            </DataTemplate>
+                        </ComboBox.ItemTemplate>
+                    </ComboBox>
+
+                    <TextBlock Grid.Row="10" Grid.Column="0" Text="Versioning Configuration *" VerticalAlignment="Center" Margin="0 0 0 5" />
+                    <Grid Grid.Row="10" Grid.Column="2" Grid.ColumnSpan="5" Margin="0 0 0 5">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="5" />
@@ -152,8 +164,8 @@
                         <Button Grid.Column="2" Content="Options" Click="OpenOptions" />
                     </Grid>
 
-                    <TextBlock Grid.Row="10" Grid.Column="0" Text="Compressed Audio" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="What to do when encountering a compressed audio file" />
-                    <ComboBox Grid.Row="10" Grid.Column="2" Grid.ColumnSpan="5" ItemsSource="{Binding SettingsView.CompressedAudios}" SelectedItem="{Binding SettingsView.SelectedCompressedAudio, Mode=TwoWay}"
+                    <TextBlock Grid.Row="11" Grid.Column="0" Text="Compressed Audio" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="What to do when encountering a compressed audio file" />
+                    <ComboBox Grid.Row="11" Grid.Column="2" Grid.ColumnSpan="5" ItemsSource="{Binding SettingsView.CompressedAudios}" SelectedItem="{Binding SettingsView.SelectedCompressedAudio, Mode=TwoWay}"
                               DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}" Margin="0 0 0 5">
                         <ComboBox.ItemTemplate>
                             <DataTemplate>
@@ -162,7 +174,7 @@
                         </ComboBox.ItemTemplate>
                     </ComboBox>
 
-                    <TextBlock Grid.Row="11" Grid.Column="0" Text="AES Reload at Launch" VerticalAlignment="Center" Margin="0 0 0 5"
+                    <TextBlock Grid.Row="12" Grid.Column="0" Text="AES Reload at Launch" VerticalAlignment="Center" Margin="0 0 0 5"
                                DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}">
                         <TextBlock.Style>
                             <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
@@ -175,7 +187,7 @@
                             </Style>
                         </TextBlock.Style>
                     </TextBlock>
-                    <ComboBox Grid.Row="11" Grid.Column="2" Grid.ColumnSpan="5" ItemsSource="{Binding SettingsView.AesReloads}" SelectedItem="{Binding SettingsView.SelectedAesReload, Mode=TwoWay}"
+                    <ComboBox Grid.Row="12" Grid.Column="2" Grid.ColumnSpan="5" ItemsSource="{Binding SettingsView.AesReloads}" SelectedItem="{Binding SettingsView.SelectedAesReload, Mode=TwoWay}"
                               DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}" Margin="0 0 0 5">
                         <ComboBox.Style>
                             <Style TargetType="ComboBox" BasedOn="{StaticResource {x:Type ComboBox}}">
@@ -194,11 +206,11 @@
                         </ComboBox.ItemTemplate>
                     </ComboBox>
 
-                    <TextBlock Grid.Row="12" Grid.Column="0" Text="Keep Directory Structure" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="Auto-save packages following their game directory" />
-                    <CheckBox Grid.Row="12" Grid.Column="2" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
+                    <TextBlock Grid.Row="13" Grid.Column="0" Text="Keep Directory Structure" VerticalAlignment="Center" Margin="0 0 0 5" ToolTip="Auto-save packages following their game directory" />
+                    <CheckBox Grid.Row="13" Grid.Column="2" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
                               IsChecked="{Binding KeepDirectoryStructure, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" Margin="0 5 0 10"/>
 
-                    <TextBlock Grid.Row="13" Grid.Column="0" Text="Overwrite Mapping File" VerticalAlignment="Center" Margin="0 0 0 5"
+                    <TextBlock Grid.Row="14" Grid.Column="0" Text="Overwrite Mapping File" VerticalAlignment="Center" Margin="0 0 0 5"
                                DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}">
                         <TextBlock.Style>
                             <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
@@ -211,7 +223,7 @@
                             </Style>
                         </TextBlock.Style>
                     </TextBlock>
-                    <CheckBox Grid.Row="13" Grid.Column="2" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
+                    <CheckBox Grid.Row="14" Grid.Column="2" Content="{Binding IsChecked, RelativeSource={RelativeSource Self}, Converter={x:Static converters:BoolToToggleConverter.Instance}}"
                               IsChecked="{Binding OverwriteMapping, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay}" Margin="0 5 0 10"
                               DataContext="{Binding DataContext, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Views.SettingsView}}}">
                         <CheckBox.Style>
@@ -226,11 +238,11 @@
                         </CheckBox.Style>
                     </CheckBox>
 
-                    <TextBlock Grid.Row="14" Grid.Column="0" Text="Mapping File Path" VerticalAlignment="Center" Margin="0 0 0 5"
+                    <TextBlock Grid.Row="15" Grid.Column="0" Text="Mapping File Path" VerticalAlignment="Center" Margin="0 0 0 5"
                                Visibility="{Binding OverwriteMapping, Source={x:Static local:Settings.UserSettings.Default}, Converter={StaticResource BoolToVisibilityConverter}}" />
-                    <TextBox Grid.Row="14" Grid.Column="2" Grid.ColumnSpan="3" Text="{Binding MappingFilePath, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0 0 0 5"
+                    <TextBox Grid.Row="15" Grid.Column="2" Grid.ColumnSpan="3" Text="{Binding MappingFilePath, Source={x:Static local:Settings.UserSettings.Default}, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0 0 0 5"
                              Visibility="{Binding OverwriteMapping, Source={x:Static local:Settings.UserSettings.Default}, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                    <Button Grid.Row="14" Grid.Column="6" Content="..." HorizontalAlignment="Right" Click="OnBrowseMappings" Margin="0 0 0 5"
+                    <Button Grid.Row="15" Grid.Column="6" Content="..." HorizontalAlignment="Right" Click="OnBrowseMappings" Margin="0 0 0 5"
                             Visibility="{Binding OverwriteMapping, Source={x:Static local:Settings.UserSettings.Default}, Converter={StaticResource BoolToVisibilityConverter}}"/>
                 </Grid>
             </DataTemplate>