diff --git a/Ryujinx.Ava/App.axaml.cs b/Ryujinx.Ava/App.axaml.cs
index c35f1279b..edfcd97d8 100644
--- a/Ryujinx.Ava/App.axaml.cs
+++ b/Ryujinx.Ava/App.axaml.cs
@@ -16,7 +16,7 @@ using System.IO;
 
 namespace Ryujinx.Ava
 {
-    public class App : Avalonia.Application
+    internal class App : Avalonia.Application
     {
         public override void Initialize()
         {
diff --git a/Ryujinx.Ava/AppHost.cs b/Ryujinx.Ava/AppHost.cs
index 09163bd60..338e5f357 100644
--- a/Ryujinx.Ava/AppHost.cs
+++ b/Ryujinx.Ava/AppHost.cs
@@ -50,7 +50,7 @@ using WindowState = Avalonia.Controls.WindowState;
 
 namespace Ryujinx.Ava
 {
-    public class AppHost
+    internal class AppHost
     {
         private const int CursorHideIdleTime = 8; // Hide Cursor seconds
 
diff --git a/Ryujinx.Ava/Common/ApplicationHelper.cs b/Ryujinx.Ava/Common/ApplicationHelper.cs
index 877eaf71a..7d28e7e25 100644
--- a/Ryujinx.Ava/Common/ApplicationHelper.cs
+++ b/Ryujinx.Ava/Common/ApplicationHelper.cs
@@ -28,7 +28,7 @@ using Path = System.IO.Path;
 
 namespace Ryujinx.Ava.Common
 {
-    public static class ApplicationHelper
+    internal static class ApplicationHelper
     {
         private static HorizonClient _horizonClient;
         private static AccountManager _accountManager;
diff --git a/Ryujinx.Ava/Common/Locale/LocaleExtension.cs b/Ryujinx.Ava/Common/Locale/LocaleExtension.cs
index a9e5cac5c..8fca1a00d 100644
--- a/Ryujinx.Ava/Common/Locale/LocaleExtension.cs
+++ b/Ryujinx.Ava/Common/Locale/LocaleExtension.cs
@@ -5,7 +5,7 @@ using System;
 
 namespace Ryujinx.Ava.Common.Locale
 {
-    public class LocaleExtension : MarkupExtension
+    internal class LocaleExtension : MarkupExtension
     {
         public LocaleExtension(string key)
         {
diff --git a/Ryujinx.Ava/Input/AvaloniaKeyboard.cs b/Ryujinx.Ava/Input/AvaloniaKeyboard.cs
index a75758b90..5b888bf57 100644
--- a/Ryujinx.Ava/Input/AvaloniaKeyboard.cs
+++ b/Ryujinx.Ava/Input/AvaloniaKeyboard.cs
@@ -10,7 +10,7 @@ using Key = Ryujinx.Input.Key;
 
 namespace Ryujinx.Ava.Input
 {
-    public class AvaloniaKeyboard : IKeyboard
+    internal class AvaloniaKeyboard : IKeyboard
     {
         private readonly List<ButtonMappingEntry> _buttonsUserMapping;
         private readonly AvaloniaKeyboardDriver _driver;
diff --git a/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs b/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs
index 1177e67a1..910de1860 100644
--- a/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs
+++ b/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs
@@ -10,7 +10,7 @@ using Key = Ryujinx.Input.Key;
 
 namespace Ryujinx.Ava.Input
 {
-    public class AvaloniaKeyboardDriver : IGamepadDriver
+    internal class AvaloniaKeyboardDriver : IGamepadDriver
     {
         private static readonly string[] _keyboardIdentifers = new string[1] { "0" };
         private readonly Control _control;
diff --git a/Ryujinx.Ava/Input/AvaloniaMappingHelper.cs b/Ryujinx.Ava/Input/AvaloniaMappingHelper.cs
index b0aa2cc71..e1ef3ebc3 100644
--- a/Ryujinx.Ava/Input/AvaloniaMappingHelper.cs
+++ b/Ryujinx.Ava/Input/AvaloniaMappingHelper.cs
@@ -5,7 +5,7 @@ using AvaKey = Avalonia.Input.Key;
 
 namespace Ryujinx.Ava.Input
 {
-    public static class AvaloniaMappingHelper
+    internal static class AvaloniaMappingHelper
     {
         private static readonly AvaKey[] _keyMapping = new AvaKey[(int)Key.Count]
         {
diff --git a/Ryujinx.Ava/Input/AvaloniaMouse.cs b/Ryujinx.Ava/Input/AvaloniaMouse.cs
index f3c2271bd..a3ca2ff81 100644
--- a/Ryujinx.Ava/Input/AvaloniaMouse.cs
+++ b/Ryujinx.Ava/Input/AvaloniaMouse.cs
@@ -6,7 +6,7 @@ using System.Numerics;
 
 namespace Ryujinx.Ava.Input
 {
-    public class AvaloniaMouse : IMouse
+    internal class AvaloniaMouse : IMouse
     {
         private AvaloniaMouseDriver _driver;
 
diff --git a/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs b/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs
index 5a9fe7917..d00ea667e 100644
--- a/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs
+++ b/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs
@@ -9,7 +9,7 @@ using Size = System.Drawing.Size;
 
 namespace Ryujinx.Ava.Input
 {
-    public class AvaloniaMouseDriver : IGamepadDriver
+    internal class AvaloniaMouseDriver : IGamepadDriver
     {
         private Control _widget;
         private bool _isDisposed;
diff --git a/Ryujinx.Ava/Modules/Updater/Updater.cs b/Ryujinx.Ava/Modules/Updater/Updater.cs
index 43ff27ad8..708c2a08e 100644
--- a/Ryujinx.Ava/Modules/Updater/Updater.cs
+++ b/Ryujinx.Ava/Modules/Updater/Updater.cs
@@ -23,7 +23,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Modules
 {
-    public static class Updater
+    internal static class Updater
     {
         private const string GitHubApiURL = "https://api.github.com";
         internal static bool Running;
diff --git a/Ryujinx.Ava/Ui/Applet/ErrorAppletWindow.axaml.cs b/Ryujinx.Ava/Ui/Applet/ErrorAppletWindow.axaml.cs
index d4ec45a8a..12fb8b0fa 100644
--- a/Ryujinx.Ava/Ui/Applet/ErrorAppletWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Applet/ErrorAppletWindow.axaml.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Ui.Applet
 {
-    public class ErrorAppletWindow : StyleableWindow
+    internal class ErrorAppletWindow : StyleableWindow
     {
         private readonly Window _owner;
         private object _buttonResponse;
diff --git a/Ryujinx.Ava/Ui/Applet/SwkbdAppletDialog.axaml.cs b/Ryujinx.Ava/Ui/Applet/SwkbdAppletDialog.axaml.cs
index e81f75bd5..2d56c0b5a 100644
--- a/Ryujinx.Ava/Ui/Applet/SwkbdAppletDialog.axaml.cs
+++ b/Ryujinx.Ava/Ui/Applet/SwkbdAppletDialog.axaml.cs
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class SwkbdAppletDialog : UserControl
+    internal class SwkbdAppletDialog : UserControl
     {
         private Predicate<int> _checkLength;
         private int _inputMax;
diff --git a/Ryujinx.Ava/Ui/Controls/ApplicationOpenedEventArgs.cs b/Ryujinx.Ava/Ui/Controls/ApplicationOpenedEventArgs.cs
index 9909bd6a2..b910ca134 100644
--- a/Ryujinx.Ava/Ui/Controls/ApplicationOpenedEventArgs.cs
+++ b/Ryujinx.Ava/Ui/Controls/ApplicationOpenedEventArgs.cs
@@ -3,7 +3,7 @@ using Ryujinx.Ui.App.Common;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class ApplicationOpenedEventArgs : RoutedEventArgs
+    internal class ApplicationOpenedEventArgs : RoutedEventArgs
     {
         public ApplicationData Application { get; }
 
diff --git a/Ryujinx.Ava/Ui/Controls/AvaloniaGlxContext.cs b/Ryujinx.Ava/Ui/Controls/AvaloniaGlxContext.cs
index 05f28cb1b..d48de41dd 100644
--- a/Ryujinx.Ava/Ui/Controls/AvaloniaGlxContext.cs
+++ b/Ryujinx.Ava/Ui/Controls/AvaloniaGlxContext.cs
@@ -5,7 +5,7 @@ using System.Runtime.Versioning;
 namespace Ryujinx.Ava.Ui.Controls
 {
     [SupportedOSPlatform("linux")]
-    public class AvaloniaGlxContext : SPB.Platform.GLX.GLXOpenGLContext
+    internal class AvaloniaGlxContext : SPB.Platform.GLX.GLXOpenGLContext
     {
         public AvaloniaGlxContext(IntPtr handle)
             : base(FramebufferFormat.Default, 0, 0, 0, false, null)
diff --git a/Ryujinx.Ava/Ui/Controls/AvaloniaWglContext.cs b/Ryujinx.Ava/Ui/Controls/AvaloniaWglContext.cs
index d7781face..01e9b9207 100644
--- a/Ryujinx.Ava/Ui/Controls/AvaloniaWglContext.cs
+++ b/Ryujinx.Ava/Ui/Controls/AvaloniaWglContext.cs
@@ -5,7 +5,7 @@ using System.Runtime.Versioning;
 namespace Ryujinx.Ava.Ui.Controls
 {
     [SupportedOSPlatform("windows")]
-    public class AvaloniaWglContext : SPB.Platform.WGL.WGLOpenGLContext
+    internal class AvaloniaWglContext : SPB.Platform.WGL.WGLOpenGLContext
     {
         public AvaloniaWglContext(IntPtr handle)
             : base(FramebufferFormat.Default, 0, 0, 0, false, null)
diff --git a/Ryujinx.Ava/Ui/Controls/BitmapArrayValueConverter.cs b/Ryujinx.Ava/Ui/Controls/BitmapArrayValueConverter.cs
index 7222d67b2..d037e5f11 100644
--- a/Ryujinx.Ava/Ui/Controls/BitmapArrayValueConverter.cs
+++ b/Ryujinx.Ava/Ui/Controls/BitmapArrayValueConverter.cs
@@ -7,7 +7,7 @@ using System.IO;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class BitmapArrayValueConverter : IValueConverter
+    internal class BitmapArrayValueConverter : IValueConverter
     {
         public static BitmapArrayValueConverter Instance = new();
 
diff --git a/Ryujinx.Ava/Ui/Controls/ButtonKeyAssigner.cs b/Ryujinx.Ava/Ui/Controls/ButtonKeyAssigner.cs
index 50afa470a..a83ef9614 100644
--- a/Ryujinx.Ava/Ui/Controls/ButtonKeyAssigner.cs
+++ b/Ryujinx.Ava/Ui/Controls/ButtonKeyAssigner.cs
@@ -10,9 +10,9 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class ButtonKeyAssigner
+    internal class ButtonKeyAssigner
     {
-        public class ButtonAssignedEventArgs : EventArgs
+        internal class ButtonAssignedEventArgs : EventArgs
         {
             public ToggleButton Button { get; }
             public bool IsAssigned { get; }
diff --git a/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs b/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs
index 2794a8159..3097cfcbc 100644
--- a/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs
+++ b/Ryujinx.Ava/Ui/Controls/ContentDialogHelper.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public static class ContentDialogHelper
+    internal static class ContentDialogHelper
     {
         private static bool _isChoiceDialogOpen;
 
diff --git a/Ryujinx.Ava/Ui/Controls/GameGridView.axaml.cs b/Ryujinx.Ava/Ui/Controls/GameGridView.axaml.cs
index 4dfe4f0e0..8259e5cb3 100644
--- a/Ryujinx.Ava/Ui/Controls/GameGridView.axaml.cs
+++ b/Ryujinx.Ava/Ui/Controls/GameGridView.axaml.cs
@@ -10,7 +10,7 @@ using System;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public partial class GameGridView : UserControl
+    internal partial class GameGridView : UserControl
     {
         private ApplicationData _selectedApplication;
         public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
diff --git a/Ryujinx.Ava/Ui/Controls/GameListView.axaml.cs b/Ryujinx.Ava/Ui/Controls/GameListView.axaml.cs
index 1cca3beac..a31626fe1 100644
--- a/Ryujinx.Ava/Ui/Controls/GameListView.axaml.cs
+++ b/Ryujinx.Ava/Ui/Controls/GameListView.axaml.cs
@@ -10,7 +10,7 @@ using System;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public partial class GameListView : UserControl
+    internal partial class GameListView : UserControl
     {
         private ApplicationData _selectedApplication;
         public static readonly RoutedEvent<ApplicationOpenedEventArgs> ApplicationOpenedEvent =
diff --git a/Ryujinx.Ava/Ui/Controls/GlyphValueConverter.cs b/Ryujinx.Ava/Ui/Controls/GlyphValueConverter.cs
index 63c6a17d7..2dae365aa 100644
--- a/Ryujinx.Ava/Ui/Controls/GlyphValueConverter.cs
+++ b/Ryujinx.Ava/Ui/Controls/GlyphValueConverter.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class GlyphValueConverter : MarkupExtension
+    internal class GlyphValueConverter : MarkupExtension
     {
         private string _key;
 
diff --git a/Ryujinx.Ava/Ui/Controls/HotKeyControl.cs b/Ryujinx.Ava/Ui/Controls/HotKeyControl.cs
index d3ab1e8f9..818359707 100644
--- a/Ryujinx.Ava/Ui/Controls/HotKeyControl.cs
+++ b/Ryujinx.Ava/Ui/Controls/HotKeyControl.cs
@@ -6,7 +6,7 @@ using System.Windows.Input;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class HotKeyControl : ContentControl, ICommandSource
+    internal class HotKeyControl : ContentControl, ICommandSource
     {
         public static readonly StyledProperty<object> CommandParameterProperty =
             AvaloniaProperty.Register<HotKeyControl, object>(nameof(CommandParameter));
diff --git a/Ryujinx.Ava/Ui/Controls/IGlContextExtension.cs b/Ryujinx.Ava/Ui/Controls/IGlContextExtension.cs
index 4ca5bd59d..79d6658d6 100644
--- a/Ryujinx.Ava/Ui/Controls/IGlContextExtension.cs
+++ b/Ryujinx.Ava/Ui/Controls/IGlContextExtension.cs
@@ -4,7 +4,7 @@ using System;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public static class IGlContextExtension
+    internal static class IGlContextExtension
     {
         public static OpenGLContextBase AsOpenGLContextBase(this IGlContext context)
         {
diff --git a/Ryujinx.Ava/Ui/Controls/InputDialog.axaml.cs b/Ryujinx.Ava/Ui/Controls/InputDialog.axaml.cs
index b9bbb66da..da0618079 100644
--- a/Ryujinx.Ava/Ui/Controls/InputDialog.axaml.cs
+++ b/Ryujinx.Ava/Ui/Controls/InputDialog.axaml.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class InputDialog : UserControl
+    internal class InputDialog : UserControl
     {
         public string Message { get; set; }
         public string Input { get; set; }
diff --git a/Ryujinx.Ava/Ui/Controls/KeyValueConverter.cs b/Ryujinx.Ava/Ui/Controls/KeyValueConverter.cs
index 8b3a30e6a..ac0b622b2 100644
--- a/Ryujinx.Ava/Ui/Controls/KeyValueConverter.cs
+++ b/Ryujinx.Ava/Ui/Controls/KeyValueConverter.cs
@@ -6,7 +6,7 @@ using System.Globalization;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class KeyValueConverter : IValueConverter
+    internal class KeyValueConverter : IValueConverter
     {
         public static KeyValueConverter Instance = new();
 
diff --git a/Ryujinx.Ava/Ui/Controls/OffscreenTextBox.cs b/Ryujinx.Ava/Ui/Controls/OffscreenTextBox.cs
index ffe5bddea..a02ff3f1d 100644
--- a/Ryujinx.Ava/Ui/Controls/OffscreenTextBox.cs
+++ b/Ryujinx.Ava/Ui/Controls/OffscreenTextBox.cs
@@ -4,7 +4,7 @@ using Avalonia.Interactivity;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class OffscreenTextBox : TextBox
+    internal class OffscreenTextBox : TextBox
     {
         public RoutedEvent<KeyEventArgs> GetKeyDownRoutedEvent()
         {
diff --git a/Ryujinx.Ava/Ui/Controls/OpenToolkitBindingsContext.cs b/Ryujinx.Ava/Ui/Controls/OpenToolkitBindingsContext.cs
index a1baba9eb..3a767ce9c 100644
--- a/Ryujinx.Ava/Ui/Controls/OpenToolkitBindingsContext.cs
+++ b/Ryujinx.Ava/Ui/Controls/OpenToolkitBindingsContext.cs
@@ -3,7 +3,7 @@ using System;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class OpenToolkitBindingsContext : IBindingsContext
+    internal class OpenToolkitBindingsContext : IBindingsContext
     {
         private readonly Func<string, IntPtr> _getProcAddress;
 
diff --git a/Ryujinx.Ava/Ui/Controls/RendererControl.cs b/Ryujinx.Ava/Ui/Controls/RendererControl.cs
index a728946cf..f81d7e17e 100644
--- a/Ryujinx.Ava/Ui/Controls/RendererControl.cs
+++ b/Ryujinx.Ava/Ui/Controls/RendererControl.cs
@@ -18,7 +18,7 @@ using System;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class RendererControl : Control
+    internal class RendererControl : Control
     {
         private int _image;
 
diff --git a/Ryujinx.Ava/Ui/Controls/UpdateWaitWindow.axaml.cs b/Ryujinx.Ava/Ui/Controls/UpdateWaitWindow.axaml.cs
index e4108ba40..bda850f22 100644
--- a/Ryujinx.Ava/Ui/Controls/UpdateWaitWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Controls/UpdateWaitWindow.axaml.cs
@@ -5,7 +5,7 @@ using Ryujinx.Ava.Ui.Windows;
 
 namespace Ryujinx.Ava.Ui.Controls
 {
-    public class UpdateWaitWindow : StyleableWindow
+    internal class UpdateWaitWindow : StyleableWindow
     {
         public UpdateWaitWindow(string primaryText, string secondaryText) : this()
         {
diff --git a/Ryujinx.Ava/Ui/Models/ControllerModel.cs b/Ryujinx.Ava/Ui/Models/ControllerModel.cs
index 3374cb102..23df40021 100644
--- a/Ryujinx.Ava/Ui/Models/ControllerModel.cs
+++ b/Ryujinx.Ava/Ui/Models/ControllerModel.cs
@@ -2,5 +2,5 @@
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public record ControllerModel(ControllerType Type, string Name);
+    internal record ControllerModel(ControllerType Type, string Name);
 }
diff --git a/Ryujinx.Ava/Ui/Models/FileSizeSortComparer.cs b/Ryujinx.Ava/Ui/Models/FileSizeSortComparer.cs
index ab685f263..4005f3285 100644
--- a/Ryujinx.Ava/Ui/Models/FileSizeSortComparer.cs
+++ b/Ryujinx.Ava/Ui/Models/FileSizeSortComparer.cs
@@ -3,7 +3,7 @@ using System.Collections;
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class FileSizeSortComparer : IComparer
+    internal class FileSizeSortComparer : IComparer
     {
         public int Compare(object x, object y)
         {
diff --git a/Ryujinx.Ava/Ui/Models/Generic/FileSizeSortComparer.cs b/Ryujinx.Ava/Ui/Models/Generic/FileSizeSortComparer.cs
index 02c3c9b4c..174098352 100644
--- a/Ryujinx.Ava/Ui/Models/Generic/FileSizeSortComparer.cs
+++ b/Ryujinx.Ava/Ui/Models/Generic/FileSizeSortComparer.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.Ava.Ui.Models.Generic
 {
-    public class FileSizeSortComparer : IComparer<ApplicationData>
+    internal class FileSizeSortComparer : IComparer<ApplicationData>
     {
         public FileSizeSortComparer() { }
         public FileSizeSortComparer(bool isAscending) { _order = isAscending ? 1 : -1; }
diff --git a/Ryujinx.Ava/Ui/Models/Generic/LastPlayedSortComparer.cs b/Ryujinx.Ava/Ui/Models/Generic/LastPlayedSortComparer.cs
index 3d4d67009..7e26cfbfc 100644
--- a/Ryujinx.Ava/Ui/Models/Generic/LastPlayedSortComparer.cs
+++ b/Ryujinx.Ava/Ui/Models/Generic/LastPlayedSortComparer.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.Ava.Ui.Models.Generic
 {
-    public class LastPlayedSortComparer : IComparer<ApplicationData>
+    internal class LastPlayedSortComparer : IComparer<ApplicationData>
     {
         public LastPlayedSortComparer() { }
         public LastPlayedSortComparer(bool isAscending) { IsAscending = isAscending; }
diff --git a/Ryujinx.Ava/Ui/Models/Generic/TimePlayedSortComparer.cs b/Ryujinx.Ava/Ui/Models/Generic/TimePlayedSortComparer.cs
index 20b30b831..da26d1950 100644
--- a/Ryujinx.Ava/Ui/Models/Generic/TimePlayedSortComparer.cs
+++ b/Ryujinx.Ava/Ui/Models/Generic/TimePlayedSortComparer.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 
 namespace Ryujinx.Ava.Ui.Models.Generic
 {
-    public class TimePlayedSortComparer : IComparer<ApplicationData>
+    internal class TimePlayedSortComparer : IComparer<ApplicationData>
     {
         public TimePlayedSortComparer() { }
         public TimePlayedSortComparer(bool isAscending) { _order = isAscending ? 1 : -1; }
diff --git a/Ryujinx.Ava/Ui/Models/InputConfiguration.cs b/Ryujinx.Ava/Ui/Models/InputConfiguration.cs
index b07e39606..53bf7eedb 100644
--- a/Ryujinx.Ava/Ui/Models/InputConfiguration.cs
+++ b/Ryujinx.Ava/Ui/Models/InputConfiguration.cs
@@ -7,7 +7,7 @@ using System;
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class InputConfiguration<Key, Stick> : BaseModel
+    internal class InputConfiguration<Key, Stick> : BaseModel
     {
         private float _deadzoneRight;
         private float _triggerThreshold;
diff --git a/Ryujinx.Ava/Ui/Models/LastPlayedSortComparer.cs b/Ryujinx.Ava/Ui/Models/LastPlayedSortComparer.cs
index 55f006ae8..c5c22fb26 100644
--- a/Ryujinx.Ava/Ui/Models/LastPlayedSortComparer.cs
+++ b/Ryujinx.Ava/Ui/Models/LastPlayedSortComparer.cs
@@ -4,7 +4,7 @@ using System.Collections;
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class LastPlayedSortComparer : IComparer
+    internal class LastPlayedSortComparer : IComparer
     {
         public int Compare(object x, object y)
         {
diff --git a/Ryujinx.Ava/Ui/Models/ProfileImageModel.cs b/Ryujinx.Ava/Ui/Models/ProfileImageModel.cs
index 1c9f3b053..a23b55ccb 100644
--- a/Ryujinx.Ava/Ui/Models/ProfileImageModel.cs
+++ b/Ryujinx.Ava/Ui/Models/ProfileImageModel.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class ProfileImageModel
+    internal class ProfileImageModel
     {
         public ProfileImageModel(string name, byte[] data)
         {
diff --git a/Ryujinx.Ava/Ui/Models/StatusUpdatedEventArgs.cs b/Ryujinx.Ava/Ui/Models/StatusUpdatedEventArgs.cs
index f98f5d9d1..016c5cb0c 100644
--- a/Ryujinx.Ava/Ui/Models/StatusUpdatedEventArgs.cs
+++ b/Ryujinx.Ava/Ui/Models/StatusUpdatedEventArgs.cs
@@ -2,7 +2,7 @@
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class StatusUpdatedEventArgs : EventArgs
+    internal class StatusUpdatedEventArgs : EventArgs
     {
         public bool VSyncEnabled { get; }
         public float Volume { get; }
diff --git a/Ryujinx.Ava/Ui/Models/TimePlayedSortComparer.cs b/Ryujinx.Ava/Ui/Models/TimePlayedSortComparer.cs
index f2ee79a23..3613c8c7c 100644
--- a/Ryujinx.Ava/Ui/Models/TimePlayedSortComparer.cs
+++ b/Ryujinx.Ava/Ui/Models/TimePlayedSortComparer.cs
@@ -3,7 +3,7 @@ using System.Collections;
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class TimePlayedSortComparer : IComparer
+    internal class TimePlayedSortComparer : IComparer
     {
         public int Compare(object x, object y)
         {
diff --git a/Ryujinx.Ava/Ui/Models/TimeZone.cs b/Ryujinx.Ava/Ui/Models/TimeZone.cs
index a471ed6a6..a1bad0510 100644
--- a/Ryujinx.Ava/Ui/Models/TimeZone.cs
+++ b/Ryujinx.Ava/Ui/Models/TimeZone.cs
@@ -1,6 +1,6 @@
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class TimeZone
+    internal class TimeZone
     {
         public TimeZone(string utcDifference, string location, string abbreviation)
         {
diff --git a/Ryujinx.Ava/Ui/Models/TitleUpdateModel.cs b/Ryujinx.Ava/Ui/Models/TitleUpdateModel.cs
index b87edaf5d..f864e70a9 100644
--- a/Ryujinx.Ava/Ui/Models/TitleUpdateModel.cs
+++ b/Ryujinx.Ava/Ui/Models/TitleUpdateModel.cs
@@ -3,7 +3,7 @@ using Ryujinx.Ava.Common.Locale;
 
 namespace Ryujinx.Ava.Ui.Models
 {
-    public class TitleUpdateModel
+    internal class TitleUpdateModel
     {
         public bool IsEnabled { get; set; }
         public bool IsNoUpdate { get; }
diff --git a/Ryujinx.Ava/Ui/ViewModels/BaseModel.cs b/Ryujinx.Ava/Ui/ViewModels/BaseModel.cs
index abb14c7d0..7665bffd1 100644
--- a/Ryujinx.Ava/Ui/ViewModels/BaseModel.cs
+++ b/Ryujinx.Ava/Ui/ViewModels/BaseModel.cs
@@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
 
 namespace Ryujinx.Ava.Ui.ViewModels
 {
-    public class BaseModel : INotifyPropertyChanged
+    internal class BaseModel : INotifyPropertyChanged
     {
         public event PropertyChangedEventHandler PropertyChanged;
 
diff --git a/Ryujinx.Ava/Ui/ViewModels/ControllerSettingsViewModel.cs b/Ryujinx.Ava/Ui/ViewModels/ControllerSettingsViewModel.cs
index d91b2be33..0a1ed0468 100644
--- a/Ryujinx.Ava/Ui/ViewModels/ControllerSettingsViewModel.cs
+++ b/Ryujinx.Ava/Ui/ViewModels/ControllerSettingsViewModel.cs
@@ -32,7 +32,7 @@ using Key = Ryujinx.Common.Configuration.Hid.Key;
 
 namespace Ryujinx.Ava.Ui.ViewModels
 {
-    public class ControllerSettingsViewModel : BaseModel, IDisposable
+    internal class ControllerSettingsViewModel : BaseModel, IDisposable
     {
         private const string Disabled = "disabled";
         private const string ProControllerResource = "Ryujinx.Ui.Common/Resources/Controller_ProCon.svg";
diff --git a/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs b/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs
index 4de9db8ce..af4978f33 100644
--- a/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs
+++ b/Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs
@@ -36,7 +36,7 @@ using ShaderCacheLoadingState = Ryujinx.Graphics.Gpu.Shader.ShaderCacheState;
 
 namespace Ryujinx.Ava.Ui.ViewModels
 {
-    public class MainWindowViewModel : BaseModel
+    internal class MainWindowViewModel : BaseModel
     {
         private readonly MainWindow _owner;
         private ObservableCollection<ApplicationData> _applications;
diff --git a/Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs b/Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs
index 13ea0c753..ef7a53e60 100644
--- a/Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs
+++ b/Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs
@@ -24,7 +24,7 @@ using TimeZone = Ryujinx.Ava.Ui.Models.TimeZone;
 
 namespace Ryujinx.Ava.Ui.ViewModels
 {
-    public class SettingsViewModel : BaseModel
+    internal class SettingsViewModel : BaseModel
     {
         private readonly VirtualFileSystem _virtualFileSystem;
         private readonly ContentManager _contentManager;
diff --git a/Ryujinx.Ava/Ui/Windows/AboutWindow.axaml.cs b/Ryujinx.Ava/Ui/Windows/AboutWindow.axaml.cs
index 3f93ccb75..dc849f5da 100644
--- a/Ryujinx.Ava/Ui/Windows/AboutWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Windows/AboutWindow.axaml.cs
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Ui.Windows
 {
-    public class AboutWindow : StyleableWindow
+    internal class AboutWindow : StyleableWindow
     {
         public AboutWindow()
         {
diff --git a/Ryujinx.Ava/Ui/Windows/ControllerSettingsWindow.axaml.cs b/Ryujinx.Ava/Ui/Windows/ControllerSettingsWindow.axaml.cs
index 456301262..9f0c67091 100644
--- a/Ryujinx.Ava/Ui/Windows/ControllerSettingsWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Windows/ControllerSettingsWindow.axaml.cs
@@ -23,7 +23,7 @@ using Key = Ryujinx.Input.Key;
 
 namespace Ryujinx.Ava.Ui.Windows
 {
-    public class ControllerSettingsWindow : UserControl
+    internal class ControllerSettingsWindow : UserControl
     {
         private bool _dialogOpen;
 
diff --git a/Ryujinx.Ava/Ui/Windows/MainWindow.axaml.cs b/Ryujinx.Ava/Ui/Windows/MainWindow.axaml.cs
index 666bf427c..59a1480a9 100644
--- a/Ryujinx.Ava/Ui/Windows/MainWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Windows/MainWindow.axaml.cs
@@ -36,7 +36,7 @@ using InputManager = Ryujinx.Input.HLE.InputManager;
 using ProgressBar = Avalonia.Controls.ProgressBar;
 namespace Ryujinx.Ava.Ui.Windows
 {
-    public class MainWindow : StyleableWindow
+    internal class MainWindow : StyleableWindow
     {
         private bool _canUpdate;
         private bool _isClosing;
diff --git a/Ryujinx.Ava/Ui/Windows/MotionSettingsWindow.axaml.cs b/Ryujinx.Ava/Ui/Windows/MotionSettingsWindow.axaml.cs
index ce513b4b5..9ed494131 100644
--- a/Ryujinx.Ava/Ui/Windows/MotionSettingsWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Windows/MotionSettingsWindow.axaml.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Ui.Windows
 {
-    public class MotionSettingsWindow : UserControl
+    internal class MotionSettingsWindow : UserControl
     {
         private readonly InputConfiguration<GamepadInputId, StickInputId> _viewmodel;
 
diff --git a/Ryujinx.Ava/Ui/Windows/RumbleSettingsWindow.axaml.cs b/Ryujinx.Ava/Ui/Windows/RumbleSettingsWindow.axaml.cs
index 6c25423b9..dcaba18ca 100644
--- a/Ryujinx.Ava/Ui/Windows/RumbleSettingsWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Windows/RumbleSettingsWindow.axaml.cs
@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Ui.Windows
 {
-    public class RumbleSettingsWindow : UserControl
+    internal class RumbleSettingsWindow : UserControl
     {
         private readonly InputConfiguration<GamepadInputId, StickInputId> _viewmodel;
 
diff --git a/Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs b/Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs
index 4c104c4f0..fdfdd1f37 100644
--- a/Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml.cs
@@ -28,7 +28,7 @@ using TimeZone = Ryujinx.Ava.Ui.Models.TimeZone;
 
 namespace Ryujinx.Ava.Ui.Windows
 {
-    public class SettingsWindow : StyleableWindow
+    internal class SettingsWindow : StyleableWindow
     {
         private ListBox _gameList;
         private TextBox _pathBox;
diff --git a/Ryujinx.Ava/Ui/Windows/StyleableWindow.cs b/Ryujinx.Ava/Ui/Windows/StyleableWindow.cs
index e268cac19..17eb75768 100644
--- a/Ryujinx.Ava/Ui/Windows/StyleableWindow.cs
+++ b/Ryujinx.Ava/Ui/Windows/StyleableWindow.cs
@@ -9,7 +9,7 @@ using System.Reflection;
 
 namespace Ryujinx.Ava.Ui.Windows
 {
-    public class StyleableWindow : Window
+    internal class StyleableWindow : Window
     {
         public ContentDialog ContentDialog { get; private set; }
         public IBitmap IconImage { get; set; }
diff --git a/Ryujinx.Ava/Ui/Windows/UpdaterWindow.axaml.cs b/Ryujinx.Ava/Ui/Windows/UpdaterWindow.axaml.cs
index ed217fe36..c906c20e8 100644
--- a/Ryujinx.Ava/Ui/Windows/UpdaterWindow.axaml.cs
+++ b/Ryujinx.Ava/Ui/Windows/UpdaterWindow.axaml.cs
@@ -11,7 +11,7 @@ using System.Runtime.InteropServices;
 
 namespace Ryujinx.Ava.Ui.Windows
 {
-    public class UpdaterWindow : StyleableWindow
+    internal class UpdaterWindow : StyleableWindow
     {
         private readonly string _buildUrl;
         private readonly MainWindow _mainWindow;