infra: Make Avalonia the default UI (#6375)

* misc: Move Ryujinx project to Ryujinx.Gtk3

This breaks release CI for now but that's fine.

Signed-off-by: Mary Guillemard <mary@mary.zone>

* misc: Move Ryujinx.Ava project to Ryujinx

This breaks CI for now, but it's fine.

Signed-off-by: Mary Guillemard <mary@mary.zone>

* infra: Make Avalonia the default UI

Should fix CI after the previous changes.

GTK3 isn't build by the release job anymore, only by PR CI.

This also ensure that the test-ava update package is still generated to
allow update from the old testing channel.

Signed-off-by: Mary Guillemard <mary@mary.zone>

* Fix missing copy in create_app_bundle.sh

Signed-off-by: Mary Guillemard <mary@mary.zone>

* Fix syntax error

Signed-off-by: Mary Guillemard <mary@mary.zone>

---------

Signed-off-by: Mary Guillemard <mary@mary.zone>

18 files changed, 0 insertions, 1419 deletions

diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsAudioView.axaml b/src/Ryujinx.Ava/UI/Views/Settings/SettingsAudioView.axaml
deleted file mode 100644
index 657e07ee..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsAudioView.axaml
+++ /dev/null
@@ -1,81 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsAudioView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    mc:Ignorable="d"
-    x:DataType="viewModels:SettingsViewModel">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <ScrollViewer
-        Name="AudioPage"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <StackPanel
-                Margin="10"
-                HorizontalAlignment="Stretch"
-                Orientation="Vertical"
-                Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabAudio}" />
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center"
-                               Text="{locale:Locale SettingsTabSystemAudioBackend}"
-                               ToolTip.Tip="{locale:Locale AudioBackendTooltip}"
-                               Width="250" />
-                    <ComboBox SelectedIndex="{Binding AudioBackend}"
-                              Width="350"
-                              HorizontalContentAlignment="Left">
-                        <ComboBoxItem>
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendDummy}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem IsEnabled="{Binding IsOpenAlEnabled}">
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendOpenAL}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem IsEnabled="{Binding IsSoundIoEnabled}">
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSoundIO}" />
-                        </ComboBoxItem>
-                        <ComboBoxItem IsEnabled="{Binding IsSDL2Enabled}">
-                            <TextBlock Text="{locale:Locale SettingsTabSystemAudioBackendSDL2}" />
-                        </ComboBoxItem>
-                    </ComboBox>
-                </StackPanel>
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center"
-                               Text="{locale:Locale SettingsTabSystemAudioVolume}"
-                               ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
-                               Width="250" />
-                    <ui:NumberBox Value="{Binding Volume}"
-                            ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
-                            Width="350"
-                            SmallChange="1"
-                            LargeChange="10"
-                            SimpleNumberFormat="F0"
-                            SpinButtonPlacementMode="Inline"
-                            Minimum="0"
-                            Maximum="100" />
-                </StackPanel>
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <controls:SliderScroll Value="{Binding Volume}"
-                            Margin="250,0,0,0"
-                            ToolTip.Tip="{locale:Locale AudioVolumeTooltip}"
-                            Minimum="0"
-                            Maximum="100"
-                            SmallChange="1"
-                            TickFrequency="1"
-                            IsSnapToTickEnabled="True"
-                            LargeChange="10"
-                            Width="350" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </ScrollViewer>
-</UserControl>
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsAudioView.axaml.cs b/src/Ryujinx.Ava/UI/Views/Settings/SettingsAudioView.axaml.cs
deleted file mode 100644
index b672a0f2..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsAudioView.axaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia.Controls;
-
-namespace Ryujinx.Ava.UI.Views.Settings
-{
-    public partial class SettingsAudioView : UserControl
-    {
-        public SettingsAudioView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsCPUView.axaml b/src/Ryujinx.Ava/UI/Views/Settings/SettingsCPUView.axaml
deleted file mode 100644
index c74d3dd5..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsCPUView.axaml
+++ /dev/null
@@ -1,77 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsCPUView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    mc:Ignorable="d"
-    x:DataType="viewModels:SettingsViewModel">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <ScrollViewer
-        Name="CpuPage"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <StackPanel
-                Margin="10"
-                HorizontalAlignment="Stretch"
-                Orientation="Vertical"
-                Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabCpuCache}" />
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical">
-                    <CheckBox IsChecked="{Binding EnablePptc}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemEnablePptc}"
-                                   ToolTip.Tip="{locale:Locale PptcToggleTooltip}" />
-                    </CheckBox>
-                </StackPanel>
-                <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabCpuMemory}" />
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{locale:Locale SettingsTabSystemMemoryManagerMode}"
-                                   ToolTip.Tip="{locale:Locale MemoryManagerTooltip}"
-                                   Width="250" />
-                        <ComboBox SelectedIndex="{Binding MemoryMode}"
-                                  ToolTip.Tip="{locale:Locale MemoryManagerTooltip}"
-                                  HorizontalContentAlignment="Left"
-                                  Width="350">
-                            <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerSoftwareTooltip}">
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemMemoryManagerModeSoftware}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerHostTooltip}">
-                                <TextBlock Text="{locale:Locale SettingsTabSystemMemoryManagerModeHost}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem
-                                ToolTip.Tip="{locale:Locale MemoryManagerUnsafeTooltip}">
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabSystemMemoryManagerModeHostUnchecked}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <CheckBox IsChecked="{Binding UseHypervisor}"
-                              IsVisible="{Binding IsHypervisorAvailable}"
-                              ToolTip.Tip="{locale:Locale UseHypervisorTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemUseHypervisor}"
-                                   ToolTip.Tip="{locale:Locale UseHypervisorTooltip}" />
-                    </CheckBox>
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </ScrollViewer>
-</UserControl>
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsCPUView.axaml.cs b/src/Ryujinx.Ava/UI/Views/Settings/SettingsCPUView.axaml.cs
deleted file mode 100644
index a475971a..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsCPUView.axaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia.Controls;
-
-namespace Ryujinx.Ava.UI.Views.Settings
-{
-    public partial class SettingsCPUView : UserControl
-    {
-        public SettingsCPUView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsGraphicsView.axaml b/src/Ryujinx.Ava/UI/Views/Settings/SettingsGraphicsView.axaml
deleted file mode 100644
index 22449478..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsGraphicsView.axaml
+++ /dev/null
@@ -1,301 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsGraphicsView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:controls="clr-namespace:Ryujinx.Ava.UI.Controls"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    Design.Width="1000"
-    mc:Ignorable="d"
-    x:DataType="viewModels:SettingsViewModel">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <ScrollViewer
-        Name="GraphicsPage"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <StackPanel
-                Margin="10"
-                HorizontalAlignment="Stretch"
-                Orientation="Vertical"
-                Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsAPI}" />
-                <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}"
-                                Text="{locale:Locale SettingsTabGraphicsBackend}"
-                                Width="250" />
-                        <ComboBox Width="350"
-                                HorizontalContentAlignment="Left"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsBackendTooltip}"
-                                SelectedIndex="{Binding GraphicsBackendIndex}">
-                            <ComboBoxItem IsVisible="{Binding IsVulkanAvailable}">
-                                <TextBlock Text="Vulkan" />
-                            </ComboBoxItem>
-                            <ComboBoxItem IsEnabled="{Binding IsOpenGLAvailable}">
-                                <TextBlock Text="OpenGL" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal" IsVisible="{Binding IsVulkanSelected}">
-                        <TextBlock VerticalAlignment="Center"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsPreferredGpuTooltip}"
-                                Text="{locale:Locale SettingsTabGraphicsPreferredGpu}"
-                                Width="250" />
-                        <ComboBox Width="350"
-                                HorizontalContentAlignment="Left"
-                                ToolTip.Tip="{locale:Locale SettingsTabGraphicsPreferredGpuTooltip}"
-                                SelectedIndex="{Binding PreferredGpuIndex}"
-                                ItemsSource="{Binding AvailableGpus}"/>
-                    </StackPanel>
-                </StackPanel>
-                <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsFeatures}" />
-                <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">
-                    <StackPanel Orientation="Vertical">
-                        <CheckBox IsChecked="{Binding EnableShaderCache}"
-                            ToolTip.Tip="{locale:Locale ShaderCacheToggleTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsTabGraphicsEnableShaderCache}" />
-                        </CheckBox>
-                        <CheckBox IsChecked="{Binding EnableTextureRecompression}"
-                            ToolTip.Tip="{locale:Locale SettingsEnableTextureRecompressionTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsEnableTextureRecompression}" />
-                        </CheckBox>
-                        <CheckBox IsChecked="{Binding EnableMacroHLE}"
-                            ToolTip.Tip="{locale:Locale SettingsEnableMacroHLETooltip}">
-                            <TextBlock Text="{locale:Locale SettingsEnableMacroHLE}" />
-                        </CheckBox>
-                        <CheckBox IsChecked="{Binding EnableColorSpacePassthrough}"
-                                  IsVisible="{Binding ColorSpacePassthroughAvailable}"
-                            ToolTip.Tip="{locale:Locale SettingsEnableColorSpacePassthroughTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsEnableColorSpacePassthrough}" />
-                        </CheckBox>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsResolutionScale}"
-                                   Width="250" />
-                        <ComboBox SelectedIndex="{Binding ResolutionScale}"
-                                  Width="350"
-                                  HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale ResolutionScaleTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleNative}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale2x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale3x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScale4x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsResolutionScaleCustom}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                        <ui:NumberBox
-                            Margin="10,0,0,0"
-                            ToolTip.Tip="{locale:Locale ResolutionScaleEntryTooltip}"
-                            MinWidth="150"
-                            SmallChange="0.1"
-                            LargeChange="1"
-                            SimpleNumberFormat="F2"
-                            SpinButtonPlacementMode="Inline"
-                            IsVisible="{Binding IsCustomResolutionScaleActive}"
-                            Maximum="100"
-                            Minimum="0.1"
-                            Value="{Binding CustomResolutionScale}" />
-                    </StackPanel>
-                    <StackPanel
-                        HorizontalAlignment="Stretch"
-                        Orientation="Vertical"
-                        Spacing="10">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock VerticalAlignment="Center"
-                                       ToolTip.Tip="{locale:Locale GraphicsAATooltip}"
-                                       Text="{locale:Locale GraphicsAALabel}"
-                                       Width="250" />
-                            <ComboBox Width="350"
-                                      HorizontalContentAlignment="Left"
-                                      ToolTip.Tip="{locale:Locale GraphicsAATooltip}"
-                                      SelectedIndex="{Binding AntiAliasingEffect}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="FXAA" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaLow}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaMedium}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaHigh}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SmaaUltra}" />
-                                </ComboBoxItem>
-                            </ComboBox>
-                        </StackPanel>
-                    </StackPanel>
-                    <StackPanel
-                        HorizontalAlignment="Stretch"
-                        Orientation="Vertical"
-                        Spacing="10">
-                        <StackPanel Orientation="Horizontal">
-                            <TextBlock VerticalAlignment="Center"
-                                       ToolTip.Tip="{locale:Locale GraphicsScalingFilterTooltip}"
-                                       Text="{locale:Locale GraphicsScalingFilterLabel}"
-                                       Width="250" />
-                            <ComboBox Width="350"
-                                      HorizontalContentAlignment="Left"
-                                      ToolTip.Tip="{locale:Locale GraphicsScalingFilterTooltip}"
-                                      SelectedIndex="{Binding ScalingFilter}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="Bilinear" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="Nearest" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="FSR" />
-                                </ComboBoxItem>
-                            </ComboBox>
-                            <controls:SliderScroll Value="{Binding ScalingFilterLevel}"
-                                    ToolTip.Tip="{locale:Locale GraphicsScalingFilterLevelTooltip}"
-                                    MinWidth="150"
-                                    Margin="10,-3,0,0"
-                                    Height="32"
-                                    Padding="0,-5"
-                                    IsVisible="{Binding IsScalingFilterActive}"
-                                    TickFrequency="1"
-                                    IsSnapToTickEnabled="True"
-                                    LargeChange="10"
-                                    SmallChange="1"
-                                    VerticalAlignment="Center"
-                                    Minimum="0"
-                                    Maximum="100" />
-                            <TextBlock Margin="5,0"
-                                       Width="40"
-                                       IsVisible="{Binding IsScalingFilterActive}"
-                                       Text="{Binding ScalingFilterLevelText}"/>
-                        </StackPanel>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale AnisotropyTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering}"
-                                   Width="250" />
-                        <ComboBox SelectedIndex="{Binding MaxAnisotropy}"
-                                  Width="350"
-                                  HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale AnisotropyTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabGraphicsAnisotropicFilteringAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering2x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering4x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering8x}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabGraphicsAnisotropicFiltering16x}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale AspectRatioTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsAspectRatio}"
-                                   Width="250" />
-                        <ComboBox SelectedIndex="{Binding AspectRatio}"
-                                  Width="350"
-                                  HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale AspectRatioTooltip}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio4x3}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio16x10}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio21x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatio32x9}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGraphicsAspectRatioStretch}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                </StackPanel>
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical"
-                    Spacing="10">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale GraphicsBackendThreadingTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsBackendMultithreading}"
-                                   Width="250" />
-                        <ComboBox Width="350"
-                                  HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{locale:Locale GalThreadingTooltip}"
-                                  SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonOff}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale CommonOn}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                </StackPanel>
-                <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGraphicsDeveloperOptions}" />
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical"
-                    Spacing="10">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale ShaderDumpPathTooltip}"
-                                   Text="{locale:Locale SettingsTabGraphicsShaderDumpPath}"
-                                   Width="250" />
-                        <TextBox Text="{Binding ShaderDumpPath}"
-                                 Width="350"
-                                 ToolTip.Tip="{locale:Locale ShaderDumpPathTooltip}" />
-                    </StackPanel>
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </ScrollViewer>
-</UserControl>
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsGraphicsView.axaml.cs b/src/Ryujinx.Ava/UI/Views/Settings/SettingsGraphicsView.axaml.cs
deleted file mode 100644
index 67341330..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsGraphicsView.axaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia.Controls;
-
-namespace Ryujinx.Ava.UI.Views.Settings
-{
-    public partial class SettingsGraphicsView : UserControl
-    {
-        public SettingsGraphicsView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsHotkeysView.axaml b/src/Ryujinx.Ava/UI/Views/Settings/SettingsHotkeysView.axaml
deleted file mode 100644
index b4eae01e..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsHotkeysView.axaml
+++ /dev/null
@@ -1,103 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsHotkeysView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    mc:Ignorable="d"
-    x:DataType="viewModels:SettingsViewModel"
-    Focusable="True">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <UserControl.Resources>
-        <helpers:KeyValueConverter x:Key="Key" />
-    </UserControl.Resources>
-    <ScrollViewer
-        Name="HotkeysPage"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <StackPanel Margin="10" Orientation="Vertical" Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabHotkeysHotkeys}" />
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysToggleVsyncHotkey}" Width="230" />
-                    <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
-                        <TextBlock
-                            Text="{Binding KeyboardHotkeys.ToggleVsync, Mode=TwoWay, Converter={StaticResource Key}}"
-                            TextAlignment="Center" />
-                    </ToggleButton>
-                </StackPanel>
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysScreenshotHotkey}" Width="230" />
-                    <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
-                        <TextBlock
-                            Text="{Binding KeyboardHotkeys.Screenshot, Mode=TwoWay, Converter={StaticResource Key}}"
-                            TextAlignment="Center" />
-                    </ToggleButton>
-                </StackPanel>
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysShowUiHotkey}" Width="230" />
-                    <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
-                        <TextBlock
-                            Text="{Binding KeyboardHotkeys.ShowUI, Mode=TwoWay, Converter={StaticResource Key}}"
-                            TextAlignment="Center" />
-                    </ToggleButton>
-                </StackPanel>
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysPauseHotkey}" Width="230" />
-                    <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
-                        <TextBlock
-                            Text="{Binding KeyboardHotkeys.Pause, Mode=TwoWay, Converter={StaticResource Key}}"
-                            TextAlignment="Center" />
-                    </ToggleButton>
-                </StackPanel>
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysToggleMuteHotkey}" Width="230" />
-                    <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
-                        <TextBlock
-                            Text="{Binding KeyboardHotkeys.ToggleMute, Mode=TwoWay, Converter={StaticResource Key}}"
-                            TextAlignment="Center" />
-                    </ToggleButton>
-                </StackPanel>
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysResScaleUpHotkey}" Width="230" />
-                    <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
-                        <TextBlock
-                            Text="{Binding KeyboardHotkeys.ResScaleUp, Mode=TwoWay, Converter={StaticResource Key}}"
-                            TextAlignment="Center" />
-                    </ToggleButton>
-                </StackPanel>
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysResScaleDownHotkey}" Width="230" />
-                    <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
-                        <TextBlock
-                            Text="{Binding KeyboardHotkeys.ResScaleDown, Mode=TwoWay, Converter={StaticResource Key}}"
-                            TextAlignment="Center" />
-                    </ToggleButton>
-                </StackPanel>
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysVolumeUpHotkey}" Width="230" />
-                    <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
-                        <TextBlock
-                            Text="{Binding KeyboardHotkeys.VolumeUp, Mode=TwoWay, Converter={StaticResource Key}}"
-                            TextAlignment="Center" />
-                    </ToggleButton>
-                </StackPanel>
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center" Text="{locale:Locale SettingsTabHotkeysVolumeDownHotkey}" Width="230" />
-                    <ToggleButton Width="90" Height="27" Checked="Button_Checked" Unchecked="Button_Unchecked">
-                        <TextBlock
-                            Text="{Binding KeyboardHotkeys.VolumeDown, Mode=TwoWay, Converter={StaticResource Key}}"
-                            TextAlignment="Center" />
-                    </ToggleButton>
-                </StackPanel>
-            </StackPanel>
-        </Border>
-   </ScrollViewer>
-</UserControl>
\ No newline at end of file
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsHotkeysView.axaml.cs b/src/Ryujinx.Ava/UI/Views/Settings/SettingsHotkeysView.axaml.cs
deleted file mode 100644
index b006d703..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsHotkeysView.axaml.cs
+++ /dev/null
@@ -1,81 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Controls.Primitives;
-using Avalonia.Input;
-using Avalonia.Interactivity;
-using Ryujinx.Ava.Input;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Input;
-using Ryujinx.Input.Assigner;
-
-namespace Ryujinx.Ava.UI.Views.Settings
-{
-    public partial class SettingsHotkeysView : UserControl
-    {
-        private ButtonKeyAssigner _currentAssigner;
-        private readonly IGamepadDriver _avaloniaKeyboardDriver;
-
-        public SettingsHotkeysView()
-        {
-            InitializeComponent();
-            _avaloniaKeyboardDriver = new AvaloniaKeyboardDriver(this);
-        }
-
-        private void MouseClick(object sender, PointerPressedEventArgs e)
-        {
-            bool shouldUnbind = e.GetCurrentPoint(this).Properties.IsMiddleButtonPressed;
-
-            _currentAssigner?.Cancel(shouldUnbind);
-
-            PointerPressed -= MouseClick;
-        }
-
-        private void Button_Checked(object sender, RoutedEventArgs e)
-        {
-            if (sender is ToggleButton button)
-            {
-                if (_currentAssigner != null && button == _currentAssigner.ToggledButton)
-                {
-                    return;
-                }
-
-                if (_currentAssigner == null && button.IsChecked != null && (bool)button.IsChecked)
-                {
-                    _currentAssigner = new ButtonKeyAssigner(button);
-
-                    this.Focus(NavigationMethod.Pointer);
-
-                    PointerPressed += MouseClick;
-
-                    var keyboard = (IKeyboard)_avaloniaKeyboardDriver.GetGamepad(_avaloniaKeyboardDriver.GamepadsIds[0]);
-                    IButtonAssigner assigner = new KeyboardKeyAssigner(keyboard);
-
-                    _currentAssigner.GetInputAndAssign(assigner);
-                }
-                else
-                {
-                    if (_currentAssigner != null)
-                    {
-                        ToggleButton oldButton = _currentAssigner.ToggledButton;
-
-                        _currentAssigner.Cancel();
-                        _currentAssigner = null;
-
-                        button.IsChecked = false;
-                    }
-                }
-            }
-        }
-
-        private void Button_Unchecked(object sender, RoutedEventArgs e)
-        {
-            _currentAssigner?.Cancel();
-            _currentAssigner = null;
-        }
-
-        public void Dispose()
-        {
-            _currentAssigner?.Cancel();
-            _currentAssigner = null;
-        }
-    }
-}
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml b/src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml
deleted file mode 100644
index 81f4b68b..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml
+++ /dev/null
@@ -1,67 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsInputView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:views="clr-namespace:Ryujinx.Ava.UI.Views.Input"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    mc:Ignorable="d"
-    x:DataType="viewModels:SettingsViewModel">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <ScrollViewer
-        Name="InputPage"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <Panel
-                Margin="10">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="*" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <views:ControllerInputView
-                        Grid.Row="0"
-                        Name="ControllerSettings" />
-                    <StackPanel
-                        Orientation="Vertical"
-                        Grid.Row="2">
-                        <Separator
-                            Margin="0 10"
-                            Height="1" />
-                        <StackPanel
-                            Orientation="Horizontal"
-                            Spacing="10">
-                            <CheckBox
-                                ToolTip.Tip="{locale:Locale DockModeToggleTooltip}"
-                                MinWidth="0"
-                                IsChecked="{Binding EnableDockedMode}">
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabInputEnableDockedMode}" />
-                            </CheckBox>
-                            <CheckBox
-                                ToolTip.Tip="{locale:Locale DirectKeyboardTooltip}"
-                                IsChecked="{Binding EnableKeyboard}">
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabInputDirectKeyboardAccess}" />
-                            </CheckBox>
-                            <CheckBox
-                                ToolTip.Tip="{locale:Locale DirectMouseTooltip}"
-                                IsChecked="{Binding EnableMouse}">
-                                <TextBlock
-                                    Text="{locale:Locale SettingsTabInputDirectMouseAccess}" />
-                            </CheckBox>
-                        </StackPanel>
-                    </StackPanel>
-                </Grid>
-            </Panel>
-        </Border>
-    </ScrollViewer>
-</UserControl>
\ No newline at end of file
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml.cs b/src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml.cs
deleted file mode 100644
index e75c9f0c..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsInputView.axaml.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using Avalonia.Controls;
-
-namespace Ryujinx.Ava.UI.Views.Settings
-{
-    public partial class SettingsInputView : UserControl
-    {
-        public SettingsInputView()
-        {
-            InitializeComponent();
-        }
-
-        public void Dispose()
-        {
-            ControllerSettings.Dispose();
-        }
-    }
-}
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml b/src/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml
deleted file mode 100644
index 0fc9ea1b..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml
+++ /dev/null
@@ -1,120 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsLoggingView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    mc:Ignorable="d"
-    x:DataType="viewModels:SettingsViewModel">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <ScrollViewer
-        Name="LoggingPage"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <StackPanel
-                Margin="10"
-                HorizontalAlignment="Stretch"
-                Orientation="Vertical"
-                Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabLoggingLogging}" />
-                <StackPanel Margin="10,0,0,0" Orientation="Vertical">
-                    <CheckBox IsChecked="{Binding EnableFileLog}"
-                              ToolTip.Tip="{locale:Locale FileLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableLoggingToFile}" />
-                    </CheckBox>
-                    <CheckBox IsChecked="{Binding EnableStub}"
-                              ToolTip.Tip="{locale:Locale StubLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableStubLogs}" />
-                    </CheckBox>
-                    <CheckBox IsChecked="{Binding EnableInfo}"
-                              ToolTip.Tip="{locale:Locale InfoLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableInfoLogs}" />
-                    </CheckBox>
-                    <CheckBox IsChecked="{Binding EnableWarn}"
-                              ToolTip.Tip="{locale:Locale WarnLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableWarningLogs}" />
-                    </CheckBox>
-                    <CheckBox IsChecked="{Binding EnableError}"
-                              ToolTip.Tip="{locale:Locale ErrorLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableErrorLogs}" />
-                    </CheckBox>
-                    <CheckBox IsChecked="{Binding EnableGuest}"
-                              ToolTip.Tip="{locale:Locale GuestLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableGuestLogs}" />
-                    </CheckBox>
-                </StackPanel>
-                <Separator Height="1" />
-                <StackPanel Orientation="Vertical" Spacing="2">
-                    <TextBlock Classes="h1" Text="{locale:Locale SettingsTabLoggingDeveloperOptions}" />
-                    <TextBlock Foreground="{DynamicResource SecondaryTextColor}" Text="{locale:Locale SettingsTabLoggingDeveloperOptionsNote}" />
-                </StackPanel>
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical"
-                    Spacing="10">
-                    <StackPanel Orientation="Vertical">
-                        <CheckBox IsChecked="{Binding EnableTrace}"
-                                  ToolTip.Tip="{locale:Locale TraceLogTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsTabLoggingEnableTraceLogs}" />
-                        </CheckBox>
-                        <CheckBox IsChecked="{Binding EnableFsAccessLog}"
-                                ToolTip.Tip="{locale:Locale FileAccessLogTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabLoggingEnableFsAccessLogs}" />
-                        </CheckBox>
-                        <CheckBox IsChecked="{Binding EnableDebug}"
-                                  ToolTip.Tip="{locale:Locale DebugLogTooltip}">
-                            <TextBlock Text="{locale:Locale SettingsTabLoggingEnableDebugLogs}" />
-                        </CheckBox>
-                        <StackPanel Margin="0,10,0,0" Orientation="Horizontal" VerticalAlignment="Stretch">
-                            <TextBlock VerticalAlignment="Center"
-                                    ToolTip.Tip="{locale:Locale FSAccessLogModeTooltip}"
-                                    Text="{locale:Locale SettingsTabLoggingFsGlobalAccessLogMode}"
-                                    Width="285" />
-                            <ui:NumberBox
-                                Maximum="3"
-                                Minimum="0"
-                                Width="150"
-                                SpinButtonPlacementMode="Inline"
-                                SmallChange="1"
-                                LargeChange="1"
-                                Value="{Binding FsGlobalAccessLogMode}" />
-                        </StackPanel>
-                        <StackPanel Margin="0,10,0,0" Orientation="Horizontal">
-                            <TextBlock VerticalAlignment="Center"
-                                    Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevel}"
-                                    ToolTip.Tip="{locale:Locale OpenGlLogLevel}"
-                                    Width="285" />
-                            <ComboBox SelectedIndex="{Binding OpenglDebugLevel}"
-                                    Width="150"
-                                    HorizontalContentAlignment="Left"
-                                    ToolTip.Tip="{locale:Locale OpenGlLogLevel}">
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelNone}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelError}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock
-                                        Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelPerformance}" />
-                                </ComboBoxItem>
-                                <ComboBoxItem>
-                                    <TextBlock Text="{locale:Locale SettingsTabLoggingGraphicsBackendLogLevelAll}" />
-                                </ComboBoxItem>
-                            </ComboBox>
-                        </StackPanel>
-                    </StackPanel>
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </ScrollViewer>
-</UserControl>
\ No newline at end of file
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml.cs b/src/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml.cs
deleted file mode 100644
index c8df46b3..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsLoggingView.axaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia.Controls;
-
-namespace Ryujinx.Ava.UI.Views.Settings
-{
-    public partial class SettingsLoggingView : UserControl
-    {
-        public SettingsLoggingView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsNetworkView.axaml b/src/Ryujinx.Ava/UI/Views/Settings/SettingsNetworkView.axaml
deleted file mode 100644
index 9bb81463..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsNetworkView.axaml
+++ /dev/null
@@ -1,58 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsNetworkView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    mc:Ignorable="d"
-    x:DataType="viewModels:SettingsViewModel">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <ScrollViewer
-        Name="NetworkPage"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <StackPanel
-                Margin="10"
-                HorizontalAlignment="Stretch"
-                Orientation="Vertical"
-                Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabNetworkMultiplayer}" />
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center"
-                        Text="{locale:Locale MultiplayerMode}"
-                        ToolTip.Tip="{locale:Locale MultiplayerModeTooltip}"
-                        Width="200" />
-                    <ComboBox SelectedIndex="{Binding MultiplayerModeIndex}"
-                        ToolTip.Tip="{locale:Locale MultiplayerModeTooltip}"
-                        HorizontalContentAlignment="Left"
-                        ItemsSource="{Binding MultiplayerModes}"
-                        Width="250" />
-                </StackPanel>
-                <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabNetworkConnection}" />
-                <CheckBox Margin="10,0,0,0" IsChecked="{Binding EnableInternetAccess}">
-                    <TextBlock Text="{locale:Locale SettingsTabSystemEnableInternetAccess}"
-                        ToolTip.Tip="{locale:Locale EnableInternetAccessTooltip}" />
-                </CheckBox>
-                <StackPanel Margin="10,0,0,0" Orientation="Horizontal">
-                    <TextBlock VerticalAlignment="Center"
-                        Text="{locale:Locale SettingsTabNetworkInterface}"
-                        ToolTip.Tip="{locale:Locale NetworkInterfaceTooltip}"
-                        Width="200" />
-                    <ComboBox SelectedIndex="{Binding NetworkInterfaceIndex}"
-                        ToolTip.Tip="{locale:Locale NetworkInterfaceTooltip}"
-                        HorizontalContentAlignment="Left"
-                        ItemsSource="{Binding NetworkInterfaceList}"
-                        Width="250" />
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </ScrollViewer>
-</UserControl>
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsNetworkView.axaml.cs b/src/Ryujinx.Ava/UI/Views/Settings/SettingsNetworkView.axaml.cs
deleted file mode 100644
index b771933e..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsNetworkView.axaml.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using Avalonia.Controls;
-
-namespace Ryujinx.Ava.UI.Views.Settings
-{
-    public partial class SettingsNetworkView : UserControl
-    {
-        public SettingsNetworkView()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml b/src/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml
deleted file mode 100644
index e6f7c6e4..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml
+++ /dev/null
@@ -1,224 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsSystemView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    mc:Ignorable="d"
-    x:DataType="viewModels:SettingsViewModel">
-    <UserControl.Resources>
-        <helpers:TimeZoneConverter x:Key="TimeZone" />
-    </UserControl.Resources>
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <ScrollViewer
-        Name="SystemPage"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <StackPanel
-                Margin="10"
-                HorizontalAlignment="Stretch"
-                Orientation="Vertical"
-                Spacing="10">
-                <TextBlock
-                    Classes="h1"
-                    Text="{locale:Locale SettingsTabSystemCore}" />
-                <StackPanel
-                    Margin="10,0,0,0"
-                    Orientation="Vertical">
-                    <StackPanel
-                        Margin="0,0,0,10"
-                        Orientation="Horizontal">
-                        <TextBlock
-                            VerticalAlignment="Center"
-                            Text="{locale:Locale SettingsTabSystemSystemRegion}"
-                            Width="250" />
-                        <ComboBox
-                            SelectedIndex="{Binding Region}"
-                            ToolTip.Tip="{locale:Locale RegionTooltip}"
-                            HorizontalContentAlignment="Left"
-                            Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionJapan}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionUSA}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionEurope}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionAustralia}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionChina}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionKorea}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemRegionTaiwan}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <StackPanel
-                        Margin="0,0,0,10"
-                        Orientation="Horizontal">
-                        <TextBlock
-                            VerticalAlignment="Center"
-                            Text="{locale:Locale SettingsTabSystemSystemLanguage}"
-                            ToolTip.Tip="{locale:Locale LanguageTooltip}"
-                            Width="250" />
-                        <ComboBox
-                            SelectedIndex="{Binding Language}"
-                            ToolTip.Tip="{locale:Locale LanguageTooltip}"
-                            HorizontalContentAlignment="Left"
-                            Width="350">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageJapanese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageAmericanEnglish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageFrench}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageGerman}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageItalian}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSpanish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageChinese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageKorean}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageDutch}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguagePortuguese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageRussian}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTaiwanese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBritishEnglish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageCanadianFrench}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageLatinAmericanSpanish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageSimplifiedChinese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageTraditionalChinese}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <StackPanel
-                        Margin="0,0,0,10"
-                        Orientation="Horizontal">
-                        <TextBlock
-                            VerticalAlignment="Center"
-                            Text="{locale:Locale SettingsTabSystemSystemTimeZone}"
-                            ToolTip.Tip="{locale:Locale TimezoneTooltip}"
-                            Width="250" />
-                        <AutoCompleteBox
-                            Name="TimeZoneBox"
-                            Width="350"
-                            MaxDropDownHeight="500"
-                            FilterMode="Contains"
-                            ItemsSource="{Binding TimeZones}"
-                            SelectionChanged="TimeZoneBox_OnSelectionChanged"
-                            Text="{Binding Path=TimeZone, Mode=OneWay}"
-                            TextChanged="TimeZoneBox_OnTextChanged"
-                            ToolTip.Tip="{locale:Locale TimezoneTooltip}" 
-                            ValueMemberBinding="{Binding Mode=OneWay, Converter={StaticResource TimeZone}}" />
-                    </StackPanel>
-                    <StackPanel
-                        Margin="0,0,0,10"
-                        Orientation="Horizontal">
-                        <TextBlock
-                            VerticalAlignment="Center"
-                            Text="{locale:Locale SettingsTabSystemSystemTime}"
-                            ToolTip.Tip="{locale:Locale TimeTooltip}"
-                            Width="250"/>
-                        <DatePicker
-                            VerticalAlignment="Center" 
-                            SelectedDate="{Binding CurrentDate}"
-                            ToolTip.Tip="{locale:Locale TimeTooltip}"
-                            Width="350" />
-                    </StackPanel>
-                    <StackPanel
-                        Margin="250,0,0,10"
-                        Orientation="Horizontal">
-                        <TimePicker
-                            VerticalAlignment="Center"
-                            ClockIdentifier="24HourClock"
-                            SelectedTime="{Binding CurrentTime}"
-                            Width="350"
-                            ToolTip.Tip="{locale:Locale TimeTooltip}" />
-                    </StackPanel>
-                    <CheckBox IsChecked="{Binding EnableVsync}">
-                        <TextBlock
-                            Text="{locale:Locale SettingsTabSystemEnableVsync}"
-                            ToolTip.Tip="{locale:Locale VSyncToggleTooltip}" />
-                    </CheckBox>
-                    <CheckBox IsChecked="{Binding EnableFsIntegrityChecks}">
-                        <TextBlock
-                            Text="{locale:Locale SettingsTabSystemEnableFsIntegrityChecks}"
-                            ToolTip.Tip="{locale:Locale FsIntegrityToggleTooltip}" />
-                    </CheckBox>
-                </StackPanel>
-                <Separator Height="1" />
-                <StackPanel
-                    Orientation="Vertical"
-                    Spacing="2">
-                    <TextBlock
-                        Classes="h1"
-                        Text="{locale:Locale SettingsTabSystemHacks}" />
-                    <TextBlock
-                        Foreground="{DynamicResource SecondaryTextColor}"
-                        Text="{locale:Locale SettingsTabSystemHacksNote}" />
-                </StackPanel>
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical">
-                    <CheckBox
-                        IsChecked="{Binding ExpandDramSize}"
-                        ToolTip.Tip="{locale:Locale DRamTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemExpandDramSize}" />
-                    </CheckBox>
-                    <CheckBox
-                        IsChecked="{Binding IgnoreMissingServices}"
-                        ToolTip.Tip="{locale:Locale IgnoreMissingServicesTooltip}">
-                        <TextBlock Text="{locale:Locale SettingsTabSystemIgnoreMissingServices}" />
-                    </CheckBox>
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </ScrollViewer>
-</UserControl>
\ No newline at end of file
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml.cs b/src/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml.cs
deleted file mode 100644
index 2c9eac28..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsSystemView.axaml.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using Avalonia.Controls;
-using Ryujinx.Ava.UI.ViewModels;
-using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;
-
-namespace Ryujinx.Ava.UI.Views.Settings
-{
-    public partial class SettingsSystemView : UserControl
-    {
-        public SettingsViewModel ViewModel;
-
-        public SettingsSystemView()
-        {
-            InitializeComponent();
-        }
-
-        private void TimeZoneBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (e.AddedItems != null && e.AddedItems.Count > 0)
-            {
-                if (e.AddedItems[0] is TimeZone timeZone)
-                {
-                    e.Handled = true;
-
-                    ViewModel.ValidateAndSetTimeZone(timeZone.Location);
-                }
-            }
-        }
-
-        private void TimeZoneBox_OnTextChanged(object sender, TextChangedEventArgs e)
-        {
-            if (sender is AutoCompleteBox box && box.SelectedItem is TimeZone timeZone)
-            {
-                ViewModel.ValidateAndSetTimeZone(timeZone.Location);
-            }
-        }
-    }
-}
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml b/src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml
deleted file mode 100644
index 6504637e..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml
+++ /dev/null
@@ -1,128 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsUiView"
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    mc:Ignorable="d"
-    x:DataType="viewModels:SettingsViewModel">
-    <Design.DataContext>
-        <viewModels:SettingsViewModel />
-    </Design.DataContext>
-    <ScrollViewer
-        Name="UiPage"
-        HorizontalAlignment="Stretch"
-        VerticalAlignment="Stretch"
-        HorizontalScrollBarVisibility="Disabled"
-        VerticalScrollBarVisibility="Auto">
-        <Border Classes="settings">
-            <StackPanel
-                Margin="10"
-                HorizontalAlignment="Stretch"
-                Orientation="Vertical"
-                Spacing="10">
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGeneralGeneral}" />
-                <StackPanel Margin="10,0,0,0" Orientation="Vertical">
-                    <CheckBox IsChecked="{Binding EnableDiscordIntegration}">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{locale:Locale ToggleDiscordTooltip}"
-                                   Text="{locale:Locale SettingsTabGeneralEnableDiscordRichPresence}" />
-                    </CheckBox>
-                    <CheckBox IsChecked="{Binding CheckUpdatesOnStart}">
-                        <TextBlock Text="{locale:Locale SettingsTabGeneralCheckUpdatesOnLaunch}" />
-                    </CheckBox>
-                    <CheckBox IsChecked="{Binding ShowConfirmExit}">
-                        <TextBlock Text="{locale:Locale SettingsTabGeneralShowConfirmExitDialog}" />
-                    </CheckBox>
-                    <StackPanel Margin="0, 15, 0, 0" Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   Text="{locale:Locale SettingsTabGeneralHideCursor}"
-                                   Width="150" />
-                        <ComboBox SelectedIndex="{Binding HideCursor}"
-                                  HorizontalContentAlignment="Left"
-                                  MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorNever}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorOnIdle}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralHideCursorAlways}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                    <StackPanel Margin="0, 15, 0, 10" Orientation="Horizontal">
-                        <TextBlock
-                            VerticalAlignment="Center"
-                            Text="{locale:Locale SettingsTabGeneralTheme}"
-                            Width="150" />
-                        <ComboBox SelectedIndex="{Binding BaseStyleIndex}"
-                                  HorizontalContentAlignment="Left"
-                                  MinWidth="100">
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralThemeLight}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{locale:Locale SettingsTabGeneralThemeDark}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                </StackPanel>
-                <Separator Height="1" />
-                <TextBlock Classes="h1" Text="{locale:Locale SettingsTabGeneralGameDirectories}" />
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical"
-                    Spacing="10">
-                    <ListBox
-                        Name="GameList"
-                        MinHeight="230"
-                        ItemsSource="{Binding GameDirectories}">
-                        <ListBox.Styles>
-                            <Style Selector="ListBoxItem">
-                                <Setter Property="Padding" Value="10" />
-                                <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
-                            </Style>
-                        </ListBox.Styles>
-                    </ListBox>
-                    <Grid HorizontalAlignment="Stretch">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <TextBox
-                            Name="PathBox"
-                            Margin="0"
-                            ToolTip.Tip="{locale:Locale AddGameDirBoxTooltip}"
-                            VerticalAlignment="Stretch" />
-                        <Button
-                            Name="AddButton"
-                            Grid.Column="1"
-                            MinWidth="90"
-                            Margin="10,0,0,0"
-                            ToolTip.Tip="{locale:Locale AddGameDirTooltip}"
-                            Click="AddButton_OnClick">
-                            <TextBlock HorizontalAlignment="Center"
-                                       Text="{locale:Locale SettingsTabGeneralAdd}" />
-                        </Button>
-                        <Button
-                            Name="RemoveButton"
-                            Grid.Column="2"
-                            MinWidth="90"
-                            Margin="10,0,0,0"
-                            ToolTip.Tip="{locale:Locale RemoveGameDirTooltip}"
-                            Click="RemoveButton_OnClick">
-                            <TextBlock HorizontalAlignment="Center"
-                                       Text="{locale:Locale SettingsTabGeneralRemove}" />
-                        </Button>
-                    </Grid>
-                </StackPanel>
-            </StackPanel>
-        </Border>
-    </ScrollViewer>
-</UserControl>
diff --git a/src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml.cs b/src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml.cs
deleted file mode 100644
index 996d15cd..00000000
--- a/src/Ryujinx.Ava/UI/Views/Settings/SettingsUIView.axaml.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Interactivity;
-using Avalonia.Platform.Storage;
-using Avalonia.VisualTree;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.ViewModels;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-
-namespace Ryujinx.Ava.UI.Views.Settings
-{
-    public partial class SettingsUiView : UserControl
-    {
-        public SettingsViewModel ViewModel;
-
-        public SettingsUiView()
-        {
-            InitializeComponent();
-        }
-
-        private async void AddButton_OnClick(object sender, RoutedEventArgs e)
-        {
-            string path = PathBox.Text;
-
-            if (!string.IsNullOrWhiteSpace(path) && Directory.Exists(path) && !ViewModel.GameDirectories.Contains(path))
-            {
-                ViewModel.GameDirectories.Add(path);
-                ViewModel.DirectoryChanged = true;
-            }
-            else
-            {
-                if (this.GetVisualRoot() is Window window)
-                {
-                    var result = await window.StorageProvider.OpenFolderPickerAsync(new FolderPickerOpenOptions
-                    {
-                        AllowMultiple = false,
-                    });
-
-                    if (result.Count > 0)
-                    {
-                        ViewModel.GameDirectories.Add(result[0].Path.LocalPath);
-                        ViewModel.DirectoryChanged = true;
-                    }
-                }
-            }
-        }
-
-        private void RemoveButton_OnClick(object sender, RoutedEventArgs e)
-        {
-            int oldIndex = GameList.SelectedIndex;
-
-            foreach (string path in new List<string>(GameList.SelectedItems.Cast<string>()))
-            {
-                ViewModel.GameDirectories.Remove(path);
-                ViewModel.DirectoryChanged = true;
-            }
-
-            if (GameList.ItemCount > 0)
-            {
-                GameList.SelectedIndex = oldIndex < GameList.ItemCount ? oldIndex : 0;
-            }
-        }
-    }
-}