From 4f3af839be4134ed63dbd705758714bd0fbba9ef Mon Sep 17 00:00:00 2001
From: gdkchan <gab.dark.100@gmail.com>
Date: Sat, 4 Mar 2023 10:43:08 -0300
Subject: [PATCH] Minor code formatting (#4498)

---
 ARMeilleure/Instructions/InstEmitHash32.cs         |  3 +--
 ARMeilleure/Instructions/InstEmitHashHelper.cs     |  3 +--
 .../SoundIoHardwareDeviceDriver.cs                 |  3 +--
 .../Renderer/Dsp/Command/CompressorCommand.cs      |  6 +++---
 .../Renderer/Server/Effect/CompressorEffect.cs     |  2 +-
 .../UI/Controls/NavigationDialogHost.axaml.cs      |  2 +-
 Ryujinx.Ava/UI/Helpers/LoggerAdapter.cs            |  2 +-
 Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs |  4 +---
 .../UI/ViewModels/ControllerSettingsViewModel.cs   |  3 ---
 Ryujinx.Ava/UI/Views/User/UserEditorView.axaml.cs  |  2 +-
 Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs       |  2 +-
 Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs       |  2 +-
 Ryujinx.Common/SystemInfo/SystemInfo.cs            |  4 ++--
 Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs     |  2 +-
 Ryujinx.Common/SystemInterop/StdErrAdapter.cs      |  4 ++--
 .../Shader/ShaderSpecializationState.cs            |  2 +-
 Ryujinx.Graphics.Nvdec.Vp9/Dsp/InvTxfm.cs          |  4 ++--
 Ryujinx.Graphics.Nvdec.Vp9/Dsp/Reader.cs           |  4 ++--
 Ryujinx.Graphics.OpenGL/PersistentBuffers.cs       |  8 ++++----
 .../CodeGen/Spirv/SpirvDelegates.cs                |  6 +++---
 .../CodeGen/Spirv/SpirvGenerator.cs                |  3 +--
 Ryujinx.Graphics.Texture/BC7Decoder.cs             |  2 +-
 Ryujinx.Graphics.Vulkan/BackgroundResources.cs     |  6 +++---
 Ryujinx.Graphics.Vulkan/IdList.cs                  |  2 +-
 .../MoltenVK/MVKInitialization.cs                  |  2 +-
 Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs    |  2 +-
 .../HOS/Applets/Controller/ControllerApplet.cs     |  9 ++++-----
 .../SoftwareKeyboard/SoftwareKeyboardApplet.cs     |  4 ++--
 .../SoftwareKeyboardRendererBase.cs                |  8 ++++----
 .../Diagnostics/Demangler/Ast/IntegerLiteral.cs    |  2 +-
 Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs |  4 ++--
 Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs    |  2 +-
 .../HOS/Kernel/Process/HleProcessDebugger.cs       |  2 +-
 Ryujinx.HLE/HOS/ModLoader.cs                       |  8 ++++----
 .../Services/Account/Acc/AccountSaveDataManager.cs |  2 +-
 .../LibraryAppletCreator/ILibraryAppletAccessor.cs |  4 ++--
 Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs   |  2 +-
 Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs    |  3 +--
 Ryujinx.HLE/HOS/Services/IpcService.cs             |  2 +-
 .../HOS/Services/Mii/Types/RandomMiiConstants.cs   |  4 ++--
 Ryujinx.HLE/HOS/Services/Nv/NvMemoryAllocator.cs   |  6 +++---
 .../Vi/RootService/IApplicationDisplayService.cs   |  6 +++---
 Ryujinx.Horizon/Sdk/OsTypes/Impl/MultiWaitImpl.cs  |  2 +-
 Ryujinx.Horizon/Sdk/OsTypes/OsSystemEvent.cs       |  4 ++--
 Ryujinx.Horizon/Sdk/Sf/Hipc/ServerManagerBase.cs   |  4 ++--
 Ryujinx.Horizon/Sm/SmMain.cs                       |  4 ++--
 Ryujinx.Input/Assigner/GamepadButtonAssigner.cs    |  2 +-
 Ryujinx/Ui/Helper/MetalHelper.cs                   |  2 +-
 Ryujinx/Ui/RendererWidgetBase.cs                   |  8 ++++----
 Ryujinx/Ui/VKRenderer.cs                           |  2 +-
 Ryujinx/Ui/Widgets/ProfileDialog.cs                |  3 +--
 Ryujinx/Ui/Windows/ControllerWindow.cs             | 14 ++++++--------
 Ryujinx/Ui/Windows/SettingsWindow.cs               |  7 +++----
 53 files changed, 95 insertions(+), 110 deletions(-)

diff --git a/ARMeilleure/Instructions/InstEmitHash32.cs b/ARMeilleure/Instructions/InstEmitHash32.cs
index fec782dd82..5d39f8afcd 100644
--- a/ARMeilleure/Instructions/InstEmitHash32.cs
+++ b/ARMeilleure/Instructions/InstEmitHash32.cs
@@ -1,9 +1,8 @@
 using ARMeilleure.Decoders;
 using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.Translation;
-
-using static ARMeilleure.Instructions.InstEmitHelper;
 using static ARMeilleure.Instructions.InstEmitHashHelper;
+using static ARMeilleure.Instructions.InstEmitHelper;
 
 namespace ARMeilleure.Instructions
 {
diff --git a/ARMeilleure/Instructions/InstEmitHashHelper.cs b/ARMeilleure/Instructions/InstEmitHashHelper.cs
index 1dfe771c46..55a03a4f68 100644
--- a/ARMeilleure/Instructions/InstEmitHashHelper.cs
+++ b/ARMeilleure/Instructions/InstEmitHashHelper.cs
@@ -4,9 +4,8 @@ using ARMeilleure.IntermediateRepresentation;
 using ARMeilleure.Translation;
 using System;
 using System.Diagnostics;
-
-using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
 using static ARMeilleure.Instructions.InstEmitSimdHelper;
+using static ARMeilleure.IntermediateRepresentation.Operand.Factory;
 
 namespace ARMeilleure.Instructions
 {
diff --git a/Ryujinx.Audio.Backends.SoundIo/SoundIoHardwareDeviceDriver.cs b/Ryujinx.Audio.Backends.SoundIo/SoundIoHardwareDeviceDriver.cs
index 2eab590862..02da277693 100644
--- a/Ryujinx.Audio.Backends.SoundIo/SoundIoHardwareDeviceDriver.cs
+++ b/Ryujinx.Audio.Backends.SoundIo/SoundIoHardwareDeviceDriver.cs
@@ -5,9 +5,8 @@ using Ryujinx.Memory;
 using System;
 using System.Collections.Concurrent;
 using System.Threading;
-
-using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
 using static Ryujinx.Audio.Backends.SoundIo.Native.SoundIo;
+using static Ryujinx.Audio.Integration.IHardwareDeviceDriver;
 
 namespace Ryujinx.Audio.Backends.SoundIo
 {
diff --git a/Ryujinx.Audio/Renderer/Dsp/Command/CompressorCommand.cs b/Ryujinx.Audio/Renderer/Dsp/Command/CompressorCommand.cs
index 8c34429356..34231e614e 100644
--- a/Ryujinx.Audio/Renderer/Dsp/Command/CompressorCommand.cs
+++ b/Ryujinx.Audio/Renderer/Dsp/Command/CompressorCommand.cs
@@ -1,8 +1,8 @@
-using System;
-using System.Diagnostics;
-using Ryujinx.Audio.Renderer.Dsp.Effect;
+using Ryujinx.Audio.Renderer.Dsp.Effect;
 using Ryujinx.Audio.Renderer.Dsp.State;
 using Ryujinx.Audio.Renderer.Parameter.Effect;
+using System;
+using System.Diagnostics;
 
 namespace Ryujinx.Audio.Renderer.Dsp.Command
 {
diff --git a/Ryujinx.Audio/Renderer/Server/Effect/CompressorEffect.cs b/Ryujinx.Audio/Renderer/Server/Effect/CompressorEffect.cs
index f4e5ae829c..32162abcd4 100644
--- a/Ryujinx.Audio/Renderer/Server/Effect/CompressorEffect.cs
+++ b/Ryujinx.Audio/Renderer/Server/Effect/CompressorEffect.cs
@@ -1,7 +1,7 @@
 using Ryujinx.Audio.Renderer.Common;
 using Ryujinx.Audio.Renderer.Dsp.State;
-using Ryujinx.Audio.Renderer.Parameter.Effect;
 using Ryujinx.Audio.Renderer.Parameter;
+using Ryujinx.Audio.Renderer.Parameter.Effect;
 using Ryujinx.Audio.Renderer.Server.MemoryPool;
 using System;
 using System.Diagnostics;
diff --git a/Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs b/Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs
index 7418853059..1b857fae41 100644
--- a/Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs
+++ b/Ryujinx.Ava/UI/Controls/NavigationDialogHost.axaml.cs
@@ -16,9 +16,9 @@ using Ryujinx.Ava.UI.Views.User;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
 using System;
-using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
 
 namespace Ryujinx.Ava.UI.Controls
diff --git a/Ryujinx.Ava/UI/Helpers/LoggerAdapter.cs b/Ryujinx.Ava/UI/Helpers/LoggerAdapter.cs
index bb9681e225..7a29cc1989 100644
--- a/Ryujinx.Ava/UI/Helpers/LoggerAdapter.cs
+++ b/Ryujinx.Ava/UI/Helpers/LoggerAdapter.cs
@@ -6,8 +6,8 @@ namespace Ryujinx.Ava.UI.Helpers
 {
     using AvaLogger   = Avalonia.Logging.Logger;
     using AvaLogLevel = Avalonia.Logging.LogEventLevel;
-    using RyuLogger   = Ryujinx.Common.Logging.Logger;
     using RyuLogClass = Ryujinx.Common.Logging.LogClass;
+    using RyuLogger   = Ryujinx.Common.Logging.Logger;
 
     internal class LoggerAdapter : Avalonia.Logging.ILogSink
     {
diff --git a/Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs b/Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs
index 5561a20ca5..5311318c57 100644
--- a/Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs
+++ b/Ryujinx.Ava/UI/ViewModels/AmiiboWindowViewModel.cs
@@ -3,7 +3,6 @@ using Avalonia.Collections;
 using Avalonia.Media.Imaging;
 using Avalonia.Threading;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Windows;
@@ -17,7 +16,6 @@ using System.IO;
 using System.Linq;
 using System.Net.Http;
 using System.Text;
-using System.Text.Json;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.ViewModels
@@ -31,7 +29,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private readonly byte[] _amiiboLogoBytes;
         private readonly HttpClient _httpClient;
         private readonly StyleableWindow _owner;
-        
+
         private Bitmap _amiiboImage;
         private List<Amiibo.AmiiboApi> _amiiboList;
         private AvaloniaList<Amiibo.AmiiboApi> _amiibos;
diff --git a/Ryujinx.Ava/UI/ViewModels/ControllerSettingsViewModel.cs b/Ryujinx.Ava/UI/ViewModels/ControllerSettingsViewModel.cs
index f63fc34910..35256b3b54 100644
--- a/Ryujinx.Ava/UI/ViewModels/ControllerSettingsViewModel.cs
+++ b/Ryujinx.Ava/UI/ViewModels/ControllerSettingsViewModel.cs
@@ -3,11 +3,8 @@ using Avalonia.Controls;
 using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Svg.Skia;
 using Avalonia.Threading;
-using LibHac.Bcat;
-using LibHac.Tools.Fs;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
-using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Windows;
diff --git a/Ryujinx.Ava/UI/Views/User/UserEditorView.axaml.cs b/Ryujinx.Ava/UI/Views/User/UserEditorView.axaml.cs
index fb33dcf8fd..81938d23ba 100644
--- a/Ryujinx.Ava/UI/Views/User/UserEditorView.axaml.cs
+++ b/Ryujinx.Ava/UI/Views/User/UserEditorView.axaml.cs
@@ -5,8 +5,8 @@ using FluentAvalonia.UI.Controls;
 using FluentAvalonia.UI.Navigation;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
-using Ryujinx.Ava.UI.Models;
 using Ryujinx.Ava.UI.Helpers;
+using Ryujinx.Ava.UI.Models;
 using Ryujinx.HLE.HOS.Services.Account.Acc;
 using System;
 using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
diff --git a/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs b/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs
index cd4a3d8219..b0c15e4913 100644
--- a/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs
+++ b/Ryujinx.Common/SystemInfo/LinuxSystemInfo.cs
@@ -1,9 +1,9 @@
+using Ryujinx.Common.Logging;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Runtime.Versioning;
-using Ryujinx.Common.Logging;
 
 namespace Ryujinx.Common.SystemInfo
 {
diff --git a/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs b/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs
index ad022bdf06..06324a54cb 100644
--- a/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs
+++ b/Ryujinx.Common/SystemInfo/MacOSSystemInfo.cs
@@ -1,9 +1,9 @@
+using Ryujinx.Common.Logging;
 using System;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Text;
-using Ryujinx.Common.Logging;
 
 namespace Ryujinx.Common.SystemInfo
 {
diff --git a/Ryujinx.Common/SystemInfo/SystemInfo.cs b/Ryujinx.Common/SystemInfo/SystemInfo.cs
index 1db72d9b99..e9ce3c58a1 100644
--- a/Ryujinx.Common/SystemInfo/SystemInfo.cs
+++ b/Ryujinx.Common/SystemInfo/SystemInfo.cs
@@ -1,8 +1,8 @@
-using System;
+using Ryujinx.Common.Logging;
+using System;
 using System.Runtime.InteropServices;
 using System.Runtime.Intrinsics.X86;
 using System.Text;
-using Ryujinx.Common.Logging;
 
 namespace Ryujinx.Common.SystemInfo
 {
diff --git a/Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs b/Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs
index 11f0785e6f..c3598a1eb3 100644
--- a/Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs
+++ b/Ryujinx.Common/SystemInfo/WindowsSystemInfo.cs
@@ -1,8 +1,8 @@
+using Ryujinx.Common.Logging;
 using System;
 using System.Management;
 using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
-using Ryujinx.Common.Logging;
 
 namespace Ryujinx.Common.SystemInfo
 {
diff --git a/Ryujinx.Common/SystemInterop/StdErrAdapter.cs b/Ryujinx.Common/SystemInterop/StdErrAdapter.cs
index 12e240ad32..efb1421843 100644
--- a/Ryujinx.Common/SystemInterop/StdErrAdapter.cs
+++ b/Ryujinx.Common/SystemInterop/StdErrAdapter.cs
@@ -1,9 +1,9 @@
+using Ryujinx.Common.Logging;
 using System;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Threading;
-using Ryujinx.Common.Logging;
-using System.Runtime.InteropServices;
 
 namespace Ryujinx.Common.SystemInterop
 {
diff --git a/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs b/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs
index a4bf813636..856507cd74 100644
--- a/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs
+++ b/Ryujinx.Graphics.Gpu/Shader/ShaderSpecializationState.cs
@@ -1,7 +1,7 @@
 using Ryujinx.Common.Memory;
+using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Image;
 using Ryujinx.Graphics.Gpu.Memory;
-using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.Gpu.Shader.DiskCache;
 using Ryujinx.Graphics.Shader;
 using System;
diff --git a/Ryujinx.Graphics.Nvdec.Vp9/Dsp/InvTxfm.cs b/Ryujinx.Graphics.Nvdec.Vp9/Dsp/InvTxfm.cs
index 873f667ac7..3fc3c72a7a 100644
--- a/Ryujinx.Graphics.Nvdec.Vp9/Dsp/InvTxfm.cs
+++ b/Ryujinx.Graphics.Nvdec.Vp9/Dsp/InvTxfm.cs
@@ -1,7 +1,7 @@
-using System;
+using Ryujinx.Graphics.Nvdec.Vp9.Common;
+using System;
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
-using Ryujinx.Graphics.Nvdec.Vp9.Common;
 using static Ryujinx.Graphics.Nvdec.Vp9.Dsp.TxfmCommon;
 
 namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp
diff --git a/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Reader.cs b/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Reader.cs
index 5d177b4096..0509512166 100644
--- a/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Reader.cs
+++ b/Ryujinx.Graphics.Nvdec.Vp9/Dsp/Reader.cs
@@ -1,6 +1,6 @@
-using System;
+using Ryujinx.Common.Memory;
+using System;
 using System.Buffers.Binary;
-using Ryujinx.Common.Memory;
 
 namespace Ryujinx.Graphics.Nvdec.Vp9.Dsp
 {
diff --git a/Ryujinx.Graphics.OpenGL/PersistentBuffers.cs b/Ryujinx.Graphics.OpenGL/PersistentBuffers.cs
index 872efcc371..654e25b9dd 100644
--- a/Ryujinx.Graphics.OpenGL/PersistentBuffers.cs
+++ b/Ryujinx.Graphics.OpenGL/PersistentBuffers.cs
@@ -1,10 +1,10 @@
-using System;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using OpenTK.Graphics.OpenGL;
+using OpenTK.Graphics.OpenGL;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.OpenGL.Image;
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 
 namespace Ryujinx.Graphics.OpenGL
 {
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvDelegates.cs b/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvDelegates.cs
index 04c3be1b81..3ccfd7f559 100644
--- a/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvDelegates.cs
+++ b/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvDelegates.cs
@@ -1,7 +1,7 @@
-using FuncUnaryInstruction = System.Func<Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction>;
-using FuncBinaryInstruction = System.Func<Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction>;
-using FuncTernaryInstruction = System.Func<Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction>;
+using FuncBinaryInstruction = System.Func<Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction>;
 using FuncQuaternaryInstruction = System.Func<Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction>;
+using FuncTernaryInstruction = System.Func<Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction>;
+using FuncUnaryInstruction = System.Func<Spv.Generator.Instruction, Spv.Generator.Instruction, Spv.Generator.Instruction>;
 
 namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
 {
diff --git a/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvGenerator.cs b/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvGenerator.cs
index 9f08b319d0..ca82353837 100644
--- a/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvGenerator.cs
+++ b/Ryujinx.Graphics.Shader/CodeGen/Spirv/SpirvGenerator.cs
@@ -9,9 +9,8 @@ using static Spv.Specification;
 namespace Ryujinx.Graphics.Shader.CodeGen.Spirv
 {
     using SpvInstruction = Spv.Generator.Instruction;
-    using SpvLiteralInteger = Spv.Generator.LiteralInteger;
-
     using SpvInstructionPool = Spv.Generator.GeneratorPool<Spv.Generator.Instruction>;
+    using SpvLiteralInteger = Spv.Generator.LiteralInteger;
     using SpvLiteralIntegerPool = Spv.Generator.GeneratorPool<Spv.Generator.LiteralInteger>;
 
     static class SpirvGenerator
diff --git a/Ryujinx.Graphics.Texture/BC7Decoder.cs b/Ryujinx.Graphics.Texture/BC7Decoder.cs
index 060d1ab857..b865a5593c 100644
--- a/Ryujinx.Graphics.Texture/BC7Decoder.cs
+++ b/Ryujinx.Graphics.Texture/BC7Decoder.cs
@@ -1,6 +1,6 @@
 using Ryujinx.Graphics.Texture.Utils;
-using System.Diagnostics;
 using System;
+using System.Diagnostics;
 using System.Numerics;
 using System.Runtime.InteropServices;
 
diff --git a/Ryujinx.Graphics.Vulkan/BackgroundResources.cs b/Ryujinx.Graphics.Vulkan/BackgroundResources.cs
index 30972f9232..b93b7a250f 100644
--- a/Ryujinx.Graphics.Vulkan/BackgroundResources.cs
+++ b/Ryujinx.Graphics.Vulkan/BackgroundResources.cs
@@ -1,7 +1,7 @@
-using System.Threading;
-using System.Collections.Generic;
+using Silk.NET.Vulkan;
 using System;
-using Silk.NET.Vulkan;
+using System.Collections.Generic;
+using System.Threading;
 
 namespace Ryujinx.Graphics.Vulkan
 {
diff --git a/Ryujinx.Graphics.Vulkan/IdList.cs b/Ryujinx.Graphics.Vulkan/IdList.cs
index 5c0623c3f8..9fba9fe99e 100644
--- a/Ryujinx.Graphics.Vulkan/IdList.cs
+++ b/Ryujinx.Graphics.Vulkan/IdList.cs
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using System;
+using System.Collections.Generic;
 
 namespace Ryujinx.Graphics.Vulkan
 {
diff --git a/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs b/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
index ca2fbfb94b..5910d1aac8 100644
--- a/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
+++ b/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
@@ -1,7 +1,7 @@
 using Silk.NET.Vulkan;
 using System;
-using System.Runtime.Versioning;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 
 namespace Ryujinx.Graphics.Vulkan.MoltenVK
 {
diff --git a/Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs b/Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs
index c47f95eab8..7293b74f98 100644
--- a/Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs
+++ b/Ryujinx.Graphics.Vulkan/Queries/CounterQueue.cs
@@ -2,8 +2,8 @@
 using Silk.NET.Vulkan;
 using System;
 using System.Collections.Generic;
-using System.Threading;
 using System.Linq;
+using System.Threading;
 
 namespace Ryujinx.Graphics.Vulkan.Queries
 {
diff --git a/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs b/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
index e5af5fd985..5cdfb31438 100644
--- a/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
+++ b/Ryujinx.HLE/HOS/Applets/Controller/ControllerApplet.cs
@@ -1,12 +1,11 @@
+using Ryujinx.Common.Logging;
+using Ryujinx.HLE.HOS.Services.Am.AppletAE;
+using Ryujinx.HLE.HOS.Services.Hid;
+using Ryujinx.HLE.HOS.Services.Hid.Types;
 using System;
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using Ryujinx.Common.Logging;
-using Ryujinx.HLE.HOS.Services.Hid;
-using Ryujinx.HLE.HOS.Services.Hid.Types;
-using Ryujinx.HLE.HOS.Services.Am.AppletAE;
-
 using static Ryujinx.HLE.HOS.Services.Hid.HidServer.HidUtils;
 
 namespace Ryujinx.HLE.HOS.Applets
diff --git a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
index 4077ad4207..278ea56c22 100644
--- a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
+++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
@@ -297,7 +297,7 @@ namespace Ryujinx.HLE.HOS.Applets
 
                 _foregroundState = SoftwareKeyboardState.Complete;
             }
-            else if(_foregroundState == SoftwareKeyboardState.Complete)
+            else if (_foregroundState == SoftwareKeyboardState.Complete)
             {
                 // If we have already completed, we push the result text
                 // back on the output buffer and poll the application.
@@ -780,7 +780,7 @@ namespace Ryujinx.HLE.HOS.Applets
             {
                 return null;
             }
-            
+
             if (input.Length == 0)
             {
                 return string.Empty;
diff --git a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs
index 71835e2da3..9a91fa3214 100644
--- a/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs
+++ b/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardRendererBase.cs
@@ -1,16 +1,16 @@
 using Ryujinx.HLE.Ui;
 using Ryujinx.Memory;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Processing;
-using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.Fonts;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Drawing.Processing;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Numerics;
 using System.Reflection;
 using System.Runtime.InteropServices;
-using SixLabors.ImageSharp.PixelFormats;
 
 namespace Ryujinx.HLE.HOS.Applets.SoftwareKeyboard
 {
diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerLiteral.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerLiteral.cs
index ea048d7682..33752d00ca 100644
--- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerLiteral.cs
+++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Ast/IntegerLiteral.cs
@@ -1,5 +1,5 @@
-using System.IO;
 using System;
+using System.IO;
 
 namespace Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast
 {
diff --git a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs
index a6618eca4d..1bfd7ac076 100644
--- a/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs
+++ b/Ryujinx.HLE/HOS/Diagnostics/Demangler/Demangler.cs
@@ -1,8 +1,8 @@
-using System;
+using Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Ryujinx.HLE.HOS.Diagnostics.Demangler.Ast;
 
 namespace Ryujinx.HLE.HOS.Diagnostics.Demangler
 {
diff --git a/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs b/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs
index bd7d5725bb..614eb52713 100644
--- a/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Memory/KPageTableBase.cs
@@ -1,9 +1,9 @@
 using Ryujinx.Common;
 using Ryujinx.HLE.HOS.Kernel.Common;
 using Ryujinx.HLE.HOS.Kernel.Process;
+using Ryujinx.Horizon.Common;
 using Ryujinx.Memory;
 using Ryujinx.Memory.Range;
-using Ryujinx.Horizon.Common;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs b/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs
index 0a78a26dd0..8fee5c0d1f 100644
--- a/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs
+++ b/Ryujinx.HLE/HOS/Kernel/Process/HleProcessDebugger.cs
@@ -55,7 +55,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
 
             void AppendTrace(ulong address)
             {
-                if(AnalyzePointer(out PointerInfo info, address, thread))
+                if (AnalyzePointer(out PointerInfo info, address, thread))
                 {
                     trace.AppendLine($"   0x{address:x16}\t{info.ImageDisplay}\t{info.SubDisplay}");
                 }
diff --git a/Ryujinx.HLE/HOS/ModLoader.cs b/Ryujinx.HLE/HOS/ModLoader.cs
index bf0f1f8910..a6dc901358 100644
--- a/Ryujinx.HLE/HOS/ModLoader.cs
+++ b/Ryujinx.HLE/HOS/ModLoader.cs
@@ -7,15 +7,15 @@ using LibHac.Tools.FsSystem;
 using LibHac.Tools.FsSystem.RomFs;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
-using Ryujinx.HLE.Loaders.Mods;
+using Ryujinx.HLE.HOS.Kernel.Process;
 using Ryujinx.HLE.Loaders.Executables;
+using Ryujinx.HLE.Loaders.Mods;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Linq;
-using System.IO;
-using Ryujinx.HLE.HOS.Kernel.Process;
 using System.Globalization;
+using System.IO;
+using System.Linq;
 using Path = System.IO.Path;
 
 namespace Ryujinx.HLE.HOS
diff --git a/Ryujinx.HLE/HOS/Services/Account/Acc/AccountSaveDataManager.cs b/Ryujinx.HLE/HOS/Services/Account/Acc/AccountSaveDataManager.cs
index 3bd0e2da43..ec0b0a10b5 100644
--- a/Ryujinx.HLE/HOS/Services/Account/Acc/AccountSaveDataManager.cs
+++ b/Ryujinx.HLE/HOS/Services/Account/Acc/AccountSaveDataManager.cs
@@ -1,6 +1,6 @@
 using Ryujinx.Common.Configuration;
-using Ryujinx.Common.Utilities;
 using Ryujinx.Common.Logging;
+using Ryujinx.Common.Utilities;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
diff --git a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletCreator/ILibraryAppletAccessor.cs b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletCreator/ILibraryAppletAccessor.cs
index 134566d96a..4ed502e0ef 100644
--- a/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletCreator/ILibraryAppletAccessor.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/AppletAE/AllSystemAppletProxiesService/LibraryAppletCreator/ILibraryAppletAccessor.cs
@@ -133,7 +133,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
         // PopOutData() -> object<nn::am::service::IStorage>
         public ResultCode PopOutData(ServiceCtx context)
         {
-            if(_normalSession.TryPop(out byte[] data))
+            if (_normalSession.TryPop(out byte[] data))
             {
                 MakeObject(context, new IStorage(data));
 
@@ -160,7 +160,7 @@ namespace Ryujinx.HLE.HOS.Services.Am.AppletAE.AllSystemAppletProxiesService.Lib
         // PopInteractiveOutData() -> object<nn::am::service::IStorage>
         public ResultCode PopInteractiveOutData(ServiceCtx context)
         {
-            if(_interactiveSession.TryPop(out byte[] data))
+            if (_interactiveSession.TryPop(out byte[] data))
             {
                 MakeObject(context, new IStorage(data));
 
diff --git a/Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs b/Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs
index b16ea4c185..937fe76c57 100644
--- a/Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs
+++ b/Ryujinx.HLE/HOS/Services/Bcat/IServiceCreator.cs
@@ -1,8 +1,8 @@
 using LibHac;
 using LibHac.Common;
 using Ryujinx.Common;
-using Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator;
 using Ryujinx.HLE.HOS.Services.Arp;
+using Ryujinx.HLE.HOS.Services.Bcat.ServiceCreator;
 
 namespace Ryujinx.HLE.HOS.Services.Bcat
 {
diff --git a/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs b/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs
index e43b1cad0d..37143a5aae 100644
--- a/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs
+++ b/Ryujinx.HLE/HOS/Services/Fs/IFileSystemProxy.cs
@@ -14,12 +14,11 @@ using Ryujinx.Common.Logging;
 using Ryujinx.HLE.HOS.Services.Fs.FileSystemProxy;
 using System;
 using System.IO;
-
 using static Ryujinx.HLE.Utilities.StringUtils;
+using GameCardHandle = System.UInt32;
 using IFileSystem = LibHac.FsSrv.Sf.IFileSystem;
 using IStorage = LibHac.FsSrv.Sf.IStorage;
 using RightsId = LibHac.Fs.RightsId;
-using GameCardHandle = System.UInt32;
 
 namespace Ryujinx.HLE.HOS.Services.Fs
 {
diff --git a/Ryujinx.HLE/HOS/Services/IpcService.cs b/Ryujinx.HLE/HOS/Services/IpcService.cs
index 526565a58c..4c7d83ea61 100644
--- a/Ryujinx.HLE/HOS/Services/IpcService.cs
+++ b/Ryujinx.HLE/HOS/Services/IpcService.cs
@@ -4,8 +4,8 @@ using Ryujinx.HLE.HOS.Ipc;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Reflection;
 using System.Linq;
+using System.Reflection;
 
 namespace Ryujinx.HLE.HOS.Services
 {
diff --git a/Ryujinx.HLE/HOS/Services/Mii/Types/RandomMiiConstants.cs b/Ryujinx.HLE/HOS/Services/Mii/Types/RandomMiiConstants.cs
index 16e9289eb1..82529450bc 100644
--- a/Ryujinx.HLE/HOS/Services/Mii/Types/RandomMiiConstants.cs
+++ b/Ryujinx.HLE/HOS/Services/Mii/Types/RandomMiiConstants.cs
@@ -1,6 +1,6 @@
-using System;
+using Ryujinx.Common.Utilities;
+using System;
 using System.Runtime.InteropServices;
-using Ryujinx.Common.Utilities;
 
 namespace Ryujinx.HLE.HOS.Services.Mii.Types
 {
diff --git a/Ryujinx.HLE/HOS/Services/Nv/NvMemoryAllocator.cs b/Ryujinx.HLE/HOS/Services/Nv/NvMemoryAllocator.cs
index 7369bee5fb..341b5e5769 100644
--- a/Ryujinx.HLE/HOS/Services/Nv/NvMemoryAllocator.cs
+++ b/Ryujinx.HLE/HOS/Services/Nv/NvMemoryAllocator.cs
@@ -1,8 +1,8 @@
 using Ryujinx.Common.Collections;
-using System.Collections.Generic;
-using System;
-using Ryujinx.Graphics.Gpu.Memory;
 using Ryujinx.Common.Logging;
+using Ryujinx.Graphics.Gpu.Memory;
+using System;
+using System.Collections.Generic;
 
 namespace Ryujinx.HLE.HOS.Services.Nv
 {
diff --git a/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs b/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
index d6feb33f47..085d6c5194 100644
--- a/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
+++ b/Ryujinx.HLE/HOS/Services/Vi/RootService/IApplicationDisplayService.cs
@@ -6,15 +6,15 @@ using Ryujinx.HLE.HOS.Ipc;
 using Ryujinx.HLE.HOS.Kernel.Common;
 using Ryujinx.HLE.HOS.Services.SurfaceFlinger;
 using Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService;
-using Ryujinx.HLE.Ui;
 using Ryujinx.HLE.HOS.Services.Vi.RootService.ApplicationDisplayService.Types;
 using Ryujinx.HLE.HOS.Services.Vi.Types;
+using Ryujinx.HLE.Ui;
+using Ryujinx.Horizon.Common;
 using System;
-using System.Diagnostics;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Text;
-using Ryujinx.Horizon.Common;
 
 namespace Ryujinx.HLE.HOS.Services.Vi.RootService
 {
diff --git a/Ryujinx.Horizon/Sdk/OsTypes/Impl/MultiWaitImpl.cs b/Ryujinx.Horizon/Sdk/OsTypes/Impl/MultiWaitImpl.cs
index fd45792d70..a4a671eaf8 100644
--- a/Ryujinx.Horizon/Sdk/OsTypes/Impl/MultiWaitImpl.cs
+++ b/Ryujinx.Horizon/Sdk/OsTypes/Impl/MultiWaitImpl.cs
@@ -1,7 +1,7 @@
 using Ryujinx.Common;
 using Ryujinx.Horizon.Common;
-using System.Collections.Generic;
 using System;
+using System.Collections.Generic;
 
 namespace Ryujinx.Horizon.Sdk.OsTypes.Impl
 {
diff --git a/Ryujinx.Horizon/Sdk/OsTypes/OsSystemEvent.cs b/Ryujinx.Horizon/Sdk/OsTypes/OsSystemEvent.cs
index 061d7a3cd1..40723a5cfb 100644
--- a/Ryujinx.Horizon/Sdk/OsTypes/OsSystemEvent.cs
+++ b/Ryujinx.Horizon/Sdk/OsTypes/OsSystemEvent.cs
@@ -1,5 +1,5 @@
-using Ryujinx.Horizon.Sdk.OsTypes.Impl;
-using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.OsTypes.Impl;
 using System;
 
 namespace Ryujinx.Horizon.Sdk.OsTypes
diff --git a/Ryujinx.Horizon/Sdk/Sf/Hipc/ServerManagerBase.cs b/Ryujinx.Horizon/Sdk/Sf/Hipc/ServerManagerBase.cs
index 9d21290d82..c36cdda26e 100644
--- a/Ryujinx.Horizon/Sdk/Sf/Hipc/ServerManagerBase.cs
+++ b/Ryujinx.Horizon/Sdk/Sf/Hipc/ServerManagerBase.cs
@@ -1,5 +1,5 @@
-using Ryujinx.Horizon.Sdk.OsTypes;
-using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Common;
+using Ryujinx.Horizon.Sdk.OsTypes;
 using Ryujinx.Horizon.Sdk.Sf.Cmif;
 using Ryujinx.Horizon.Sdk.Sm;
 using System;
diff --git a/Ryujinx.Horizon/Sm/SmMain.cs b/Ryujinx.Horizon/Sm/SmMain.cs
index 5656d464fb..f0b4d33006 100644
--- a/Ryujinx.Horizon/Sm/SmMain.cs
+++ b/Ryujinx.Horizon/Sm/SmMain.cs
@@ -1,5 +1,5 @@
-using Ryujinx.Horizon.Prepo.Types;
-using Ryujinx.Horizon.Prepo;
+using Ryujinx.Horizon.Prepo;
+using Ryujinx.Horizon.Prepo.Types;
 using Ryujinx.Horizon.Sdk.Sf.Hipc;
 using Ryujinx.Horizon.Sdk.Sm;
 using Ryujinx.Horizon.Sm.Impl;
diff --git a/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs b/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs
index e3aaf8b1b6..8621b3a52f 100644
--- a/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs
+++ b/Ryujinx.Input/Assigner/GamepadButtonAssigner.cs
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
diff --git a/Ryujinx/Ui/Helper/MetalHelper.cs b/Ryujinx/Ui/Helper/MetalHelper.cs
index 1e10eb05ac..c2d4893e8b 100644
--- a/Ryujinx/Ui/Helper/MetalHelper.cs
+++ b/Ryujinx/Ui/Helper/MetalHelper.cs
@@ -1,7 +1,7 @@
 using Gdk;
 using System;
-using System.Runtime.Versioning;
 using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 
 namespace Ryujinx.Ui.Helper
 {
diff --git a/Ryujinx/Ui/RendererWidgetBase.cs b/Ryujinx/Ui/RendererWidgetBase.cs
index 957bbcd55a..e5d22d65c3 100644
--- a/Ryujinx/Ui/RendererWidgetBase.cs
+++ b/Ryujinx/Ui/RendererWidgetBase.cs
@@ -4,13 +4,13 @@ using Gtk;
 using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
-using Ryujinx.Ui.Common.Configuration;
-using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.GAL.Multithreading;
+using Ryujinx.Graphics.Gpu;
 using Ryujinx.Input;
 using Ryujinx.Input.GTK3;
 using Ryujinx.Input.HLE;
+using Ryujinx.Ui.Common.Configuration;
 using Ryujinx.Ui.Widgets;
 using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Formats.Png;
@@ -26,8 +26,8 @@ namespace Ryujinx.Ui
 {
     using Image = SixLabors.ImageSharp.Image;
     using Key = Input.Key;
-    using Switch = HLE.Switch;
     using ScalingFilter = Graphics.GAL.ScalingFilter;
+    using Switch = HLE.Switch;
 
     public abstract class RendererWidgetBase : DrawingArea
     {
@@ -321,7 +321,7 @@ namespace Ryujinx.Ui
                 Window.Cursor = (cursorMoveDelta >= CursorHideIdleTime * Stopwatch.Frequency) ? _invisibleCursor : null;
             }
 
-            if(ConfigurationState.Instance.Hid.EnableMouse && _isMouseInClient)
+            if (ConfigurationState.Instance.Hid.EnableMouse && _isMouseInClient)
             {
                 Window.Cursor = _invisibleCursor;
             }
diff --git a/Ryujinx/Ui/VKRenderer.cs b/Ryujinx/Ui/VKRenderer.cs
index e49b30c3b5..d2106c58f9 100644
--- a/Ryujinx/Ui/VKRenderer.cs
+++ b/Ryujinx/Ui/VKRenderer.cs
@@ -3,9 +3,9 @@ using Ryujinx.Common.Configuration;
 using Ryujinx.Input.HLE;
 using Ryujinx.Ui.Helper;
 using SPB.Graphics.Vulkan;
+using SPB.Platform.Metal;
 using SPB.Platform.Win32;
 using SPB.Platform.X11;
-using SPB.Platform.Metal;
 using SPB.Windowing;
 using System;
 using System.Runtime.InteropServices;
diff --git a/Ryujinx/Ui/Widgets/ProfileDialog.cs b/Ryujinx/Ui/Widgets/ProfileDialog.cs
index 96b44d2404..242e8bd7dc 100644
--- a/Ryujinx/Ui/Widgets/ProfileDialog.cs
+++ b/Ryujinx/Ui/Widgets/ProfileDialog.cs
@@ -1,8 +1,7 @@
 using Gtk;
+using Ryujinx.Ui.Common.Configuration;
 using System;
 using System.Reflection;
-using Ryujinx.Ui.Common.Configuration;
-
 using GUI = Gtk.Builder.ObjectAttribute;
 
 namespace Ryujinx.Ui.Widgets
diff --git a/Ryujinx/Ui/Windows/ControllerWindow.cs b/Ryujinx/Ui/Windows/ControllerWindow.cs
index 8c3a43c853..0f0fba0b84 100644
--- a/Ryujinx/Ui/Windows/ControllerWindow.cs
+++ b/Ryujinx/Ui/Windows/ControllerWindow.cs
@@ -2,11 +2,14 @@ using Gtk;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Configuration.Hid.Controller;
+using Ryujinx.Common.Configuration.Hid.Controller.Motion;
 using Ryujinx.Common.Configuration.Hid.Keyboard;
+using Ryujinx.Common.Logging;
 using Ryujinx.Common.Utilities;
-using Ryujinx.Ui.Common.Configuration;
 using Ryujinx.Input;
+using Ryujinx.Input.Assigner;
 using Ryujinx.Input.GTK3;
+using Ryujinx.Ui.Common.Configuration;
 using Ryujinx.Ui.Widgets;
 using System;
 using System.Collections.Generic;
@@ -14,15 +17,10 @@ using System.IO;
 using System.Reflection;
 using System.Text.Json;
 using System.Threading;
-
-using GUI = Gtk.Builder.ObjectAttribute;
-using Key = Ryujinx.Common.Configuration.Hid.Key;
-
 using ConfigGamepadInputId = Ryujinx.Common.Configuration.Hid.Controller.GamepadInputId;
 using ConfigStickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId;
-using Ryujinx.Common.Configuration.Hid.Controller.Motion;
-using Ryujinx.Common.Logging;
-using Ryujinx.Input.Assigner;
+using GUI = Gtk.Builder.ObjectAttribute;
+using Key = Ryujinx.Common.Configuration.Hid.Key;
 
 namespace Ryujinx.Ui.Windows
 {
diff --git a/Ryujinx/Ui/Windows/SettingsWindow.cs b/Ryujinx/Ui/Windows/SettingsWindow.cs
index 61af7d3977..f049da5058 100644
--- a/Ryujinx/Ui/Windows/SettingsWindow.cs
+++ b/Ryujinx/Ui/Windows/SettingsWindow.cs
@@ -7,9 +7,10 @@ using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.GraphicsDriver;
 using Ryujinx.Graphics.Vulkan;
-using Ryujinx.Ui.Common.Configuration;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS.Services.Time.TimeZone;
+using Ryujinx.Ui.Common.Configuration;
+using Ryujinx.Ui.Common.Configuration.System;
 using Ryujinx.Ui.Helper;
 using Ryujinx.Ui.Widgets;
 using System;
@@ -18,9 +19,7 @@ using System.Globalization;
 using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
-
 using GUI = Gtk.Builder.ObjectAttribute;
-using Ryujinx.Ui.Common.Configuration.System;
 
 namespace Ryujinx.Ui.Windows
 {
@@ -702,7 +701,7 @@ namespace Ryujinx.Ui.Windows
                                 {
                                     break;
                                 }
-                            } while(_gameDirsBoxStore.IterNext(ref treeIter));
+                            } while (_gameDirsBoxStore.IterNext(ref treeIter));
                         }
 
                         if (!_directoryChanged)