unnecessary escaping

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -22,7 +22,7 @@ body:
     id: log
     attributes:
       label: Log file
-      description: "A log file will help our developers to better diagnose and fix the issue. UPLOAD THE FILE. DO NOT COPY AND PASTE THE FILE'S CONTENT."
+      description: A log file will help our developers to better diagnose and fix the issue.
       placeholder: Logs files can be found under "Logs" folder in Ryujinx program folder. They can also be accessed by opening Ryujinx, then going to File > Open Logs Folder. You can drag and drop the log on to the text area (do not copy paste).
     validations:
       required: true

.github/workflows/build.yml

@@ -129,11 +129,11 @@ jobs:
         with:
           global-json-file: global.json
 
-      - name: Setup LLVM 17
+      - name: Setup LLVM 14
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 14
 
       - name: Install rcodesign
         run: |

.github/workflows/canary.yml

@@ -210,11 +210,11 @@ jobs:
         with:
           global-json-file: global.json
 
-      - name: Setup LLVM 17
+      - name: Setup LLVM 15
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 15
 
       - name: Install rcodesign
         run: |

.github/workflows/release.yml

@@ -3,6 +3,16 @@ name: Release job
 on:
   workflow_dispatch:
     inputs: {}
+  push:
+    branches: [ release ]
+    paths-ignore:
+      - '.github/**'
+      - 'docs/**'
+      - 'assets/**'
+      - '*.yml'
+      - '*.json'
+      - '*.config'
+      - '*.md'
 
 concurrency: release
 
@@ -191,11 +201,11 @@ jobs:
         with:
           global-json-file: global.json
 
-      - name: Setup LLVM 17
+      - name: Setup LLVM 15
         run: |
           wget https://apt.llvm.org/llvm.sh
           chmod +x llvm.sh
-          sudo ./llvm.sh 17
+          sudo ./llvm.sh 15
 
       - name: Install rcodesign
         run: |

Directory.Packages.props

@@ -3,13 +3,13 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.0.13" />
+    <PackageVersion Include="Avalonia" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.13" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.0.10" />
-    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.19" />
+    <PackageVersion Include="Avalonia.Svg" Version="11.0.0.18" />
-    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.19" />
+    <PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0.18" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -18,7 +18,7 @@
     <PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="9.4.0"/>
     <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0"/>
-    <PackageVersion Include="Concentus" Version="2.2.2" />
+    <PackageVersion Include="Concentus" Version="2.2.0" />
     <PackageVersion Include="DiscordRichPresence" Version="1.2.1.24" />
     <PackageVersion Include="DynamicData" Version="9.0.4" />
     <PackageVersion Include="FluentAvaloniaUI" Version="2.0.5" />
@@ -26,7 +26,7 @@
     <PackageVersion Include="LibHac" Version="0.19.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.3.0" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.2" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />
@@ -42,17 +42,17 @@
     <PackageVersion Include="Ryujinx.Graphics.Nvdec.Dependencies" Version="5.0.3-build14" />
     <PackageVersion Include="Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK" Version="1.2.0" />
     <PackageVersion Include="Ryujinx.SDL2-CS" Version="2.30.0-build32" />
-    <PackageVersion Include="Gommon" Version="2.7.0.2" />
+    <PackageVersion Include="Gommon" Version="2.7.0.1" />
     <PackageVersion Include="securifybv.ShellLink" Version="0.1.0" />
     <PackageVersion Include="Sep" Version="0.6.0" />
     <PackageVersion Include="shaderc.net" Version="0.1.0" />
     <PackageVersion Include="SharpMetal" Version="1.0.0-preview21" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
-    <PackageVersion Include="Silk.NET.Vulkan" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan" Version="2.21.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.21.0" />
-    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.22.0" />
+    <PackageVersion Include="Silk.NET.Vulkan.Extensions.KHR" Version="2.21.0" />
-    <PackageVersion Include="SkiaSharp" Version="2.88.9" />
+    <PackageVersion Include="SkiaSharp" Version="2.88.7" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.9" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
     <PackageVersion Include="SPB" Version="0.0.4-build32" />
     <PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
     <PackageVersion Include="System.Management" Version="9.0.0" />

distribution/macos/bundle_fix_up.py

@@ -19,7 +19,7 @@ if platform.system() == "Darwin":
 else:
     OTOOL = shutil.which("llvm-otool")
     if OTOOL is None:
-        for llvm_ver in [17, 16, 15, 14, 13]:
+        for llvm_ver in [15, 14, 13]:
             otool_path = shutil.which(f"llvm-otool-{llvm_ver}")
             if otool_path is not None:
                 OTOOL = otool_path

distribution/macos/construct_universal_dylib.py

@@ -26,7 +26,7 @@ else:
     LIPO = shutil.which("llvm-lipo")
 
     if LIPO is None:
-        for llvm_ver in [17, 16, 15, 14, 13]:
+        for llvm_ver in [15, 14, 13]:
             lipo_path = shutil.which(f"llvm-lipo-{llvm_ver}")
             if lipo_path is not None:
                 LIPO = lipo_path

distribution/macos/create_macos_build_ava.sh

@@ -67,11 +67,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_APP_
 
 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-17)" ];
+    if ! [ -x "$(command -v llvm-lipo-14)" ];
     then
         LIPO=llvm-lipo
     else
-        LIPO=llvm-lipo-17
+        LIPO=llvm-lipo-14
     fi
 else
     LIPO=lipo

distribution/macos/create_macos_build_headless.sh

@@ -62,11 +62,11 @@ python3 "$BASE_DIR/distribution/macos/construct_universal_dylib.py" "$ARM64_OUTP
 
 if ! [ -x "$(command -v lipo)" ];
 then
-    if ! [ -x "$(command -v llvm-lipo-17)" ];
+    if ! [ -x "$(command -v llvm-lipo-14)" ];
     then
         LIPO=llvm-lipo
     else
-        LIPO=llvm-lipo-17
+        LIPO=llvm-lipo-14
     fi
 else
     LIPO=lipo

distribution/macos/shortcut-template.plist

@@ -19,7 +19,7 @@
 	<key>CSResourcesFileMapped</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2018 - 2025 Ryujinx Team and Contributors.</string>
+	<string>Copyright © 2018 - 2023 Ryujinx Team and Contributors.</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>LSMinimumSystemVersion</key>

src/Ryujinx.Common/RyujinxException.cs

@@ -1,10 +0,0 @@
-using System;
-
-namespace Ryujinx.Common
-{
-    public class RyujinxException : Exception
-    {
-        public RyujinxException(string message) : base(message)
-        { }
-    }
-}

src/Ryujinx.Common/TitleIDs.cs

@@ -1,4 +1,4 @@
-using Gommon;
+using Gommon;
 using Ryujinx.Common.Configuration;
 using System;
 using System.Linq;
@@ -47,9 +47,6 @@ namespace Ryujinx.Common
 
         public static readonly string[] DiscordGameAssetKeys =
         [
-            "010008900705c000", // Dragon Quest Builders
-            "010042000a986000", // Dragon Quest Builders 2
-            
             "010055d009f78000", // Fire Emblem: Three Houses
             "0100a12011cc8000", // Fire Emblem: Shadow Dragon
             "0100a6301214e000", // Fire Emblem Engage
@@ -108,18 +105,17 @@ namespace Ryujinx.Common
             "0100f4c009322000", // Pikmin 3 Deluxe
             "0100b7c00933a000", // Pikmin 4
 
-            "0100f4300bf2c000", // New Pokémon Snap
-            "0100000011d90000", // Pokémon Brilliant Diamond
-            "01001f5010dfa000", // Pokémon Legends: Arceus
             "010003f003a34000", // Pokémon: Let's Go Pikachu!
             "0100187003a36000", // Pokémon: Let's Go Eevee!
-            "01003d200baa2000", // Pokémon Mystery Dungeon - Rescue Team DX
-            "0100a3d008c5c000", // Pokémon Scarlet
-            "01008db008c2c000", // Pokémon Shield
-            "010018e011d92000", // Pokémon Shining Pearl
             "0100abf008968000", // Pokémon Sword
+            "01008db008c2c000", // Pokémon Shield
+            "0100000011d90000", // Pokémon Brilliant Diamond
+            "010018e011d92000", // Pokémon Shining Pearl
+            "01001f5010dfa000", // Pokémon Legends: Arceus
+            "0100a3d008c5c000", // Pokémon Scarlet
             "01008f6008c5e000", // Pokémon Violet
             "0100b3f000be2000", // Pokkén Tournament DX
+            "0100f4300bf2c000", // New Pokémon Snap
 
             "01003bc0000a0000", // Splatoon 2 (US)
             "0100f8f0000a2000", // Splatoon 2 (EU)
@@ -169,21 +165,13 @@ namespace Ryujinx.Common
             "01005ea01c0fc000", // SONIC X SHADOW GENERATIONS
             "01005ea01c0fc001", // ^
 
-            "0100ff500e34a000", // Xenoblade Chronicles - Definitive Edition
-            "0100e95004038000", // Xenoblade Chronicles 2
-            "010074f013262000", // Xenoblade Chronicles 3
-
             "010056e00853a000", // A Hat in Time
-            "0100fd1014726000", // Baldurs Gate: Dark Alliance
             "0100dbf01000a000", // Burnout Paradise Remastered
             "0100744001588000", // Cars 3: Driven to Win
             "0100b41013c82000", // Cruis'n Blast
-            "010085900337e000", // Death Squared
             "01001b300b9be000", // Diablo III: Eternal Collection
             "01008c8012920000", // Dying Light Platinum Edition
             "01001cc01b2d4000", // Goat Simulator 3
-            "01003620068ea000", // Hand of Fate 2
-            "010085500130a000", // Lego City: Undercover
             "010073c01af34000", // LEGO Horizon Adventures
             "0100770008dd8000", // Monster Hunter Generations Ultimate
             "0100b04011742000", // Monster Hunter Rise
@@ -202,8 +190,6 @@ namespace Ryujinx.Common
             "01000a10041ea000", // The Elder Scrolls V: Skyrim
             "010057a01e4d4000", // TSUKIHIME -A piece of blue glass moon-
             "010080b00ad66000", // Undertale
-            "010069401adb8000", // Unicorn Overlord
-            "0100534009ff2000", // Yonder - The cloud catcher chronicles
         ];
     }
 }

src/Ryujinx.Graphics.Vulkan/Vendor.cs

@@ -92,7 +92,7 @@ namespace Ryujinx.Graphics.Vulkan
                 DriverId.MesaDozen => "Dozen",
                 DriverId.MesaNvk => "NVK",
                 DriverId.ImaginationOpenSourceMesa => "Imagination (Open)",
-                DriverId.MesaHoneykrisp => "Honeykrisp",
+                DriverId.MesaAgxv => "Honeykrisp",
                 _ => id.ToString(),
             };
         }

src/Ryujinx.HLE/HOS/Applets/PlayerSelect/PlayerSelectApplet.cs

@@ -27,19 +27,9 @@ namespace Ryujinx.HLE.HOS.Applets
             _normalSession = normalSession;
             _interactiveSession = interactiveSession;
 
-            UserProfile selected = _system.Device.UIHandler.ShowPlayerSelectDialog();
+            // TODO(jduncanator): Parse PlayerSelectConfig from input data
-            if (selected == null)
+            _normalSession.Push(BuildResponse());
-            {
+
-                _normalSession.Push(BuildResponse());
-            }
-            else if (selected.UserId == new UserId("00000000000000000000000000000080"))
-            {
-                _normalSession.Push(BuildGuestResponse());
-            }
-            else
-            {
-                _normalSession.Push(BuildResponse(selected));
-            }
             AppletStateChanged?.Invoke(this, null);
 
             _system.ReturnFocus();
@@ -47,34 +37,16 @@ namespace Ryujinx.HLE.HOS.Applets
             return ResultCode.Success;
         }
 
-        private byte[] BuildResponse(UserProfile selectedUser)
+        private byte[] BuildResponse()
         {
+            UserProfile currentUser = _system.AccountManager.LastOpenedUser;
+
             using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
             using BinaryWriter writer = new(stream);
 
             writer.Write((ulong)PlayerSelectResult.Success);
 
-            selectedUser.UserId.Write(writer);
+            currentUser.UserId.Write(writer);
-
-            return stream.ToArray();
-        }
-        
-        private byte[] BuildGuestResponse()
-        {
-            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
-            using BinaryWriter writer = new(stream);
-            
-            writer.Write(new byte());
-
-            return stream.ToArray();
-        }
-        
-        private byte[] BuildResponse()
-        {
-            using MemoryStream stream = MemoryStreamManager.Shared.GetStream();
-            using BinaryWriter writer = new(stream);
-            
-            writer.Write((ulong)PlayerSelectResult.Failure);
 
             return stream.ToArray();
         }

src/Ryujinx.HLE/HOS/Horizon.cs

@@ -284,7 +284,7 @@ namespace Ryujinx.HLE.HOS
                 ProcessCreationInfo creationInfo = new("Service", 1, 0, 0x8000000, 1, Flags, 0, 0);
 
                 uint[] defaultCapabilities = {
-                    (((uint)KScheduler.CpuCoresCount - 1) << 24) + (((uint)KScheduler.CpuCoresCount - 1) << 16) + 0x63F7u,
+                    0x030363F7,
                     0x1FFFFFCF,
                     0x207FFFEF,
                     0x47E0060F,

src/Ryujinx.HLE/HOS/Kernel/KernelContext.cs

@@ -63,7 +63,6 @@ namespace Ryujinx.HLE.HOS.Kernel
             TickSource = tickSource;
             Device = device;
             Memory = memory;
-            KScheduler.CpuCoresCount = device.CpuCoresCount;
 
             Running = true;
 

src/Ryujinx.HLE/HOS/Kernel/KernelStatic.cs

@@ -37,7 +37,7 @@ namespace Ryujinx.HLE.HOS.Kernel
                 return result;
             }
 
-            process.DefaultCpuCore = KScheduler.CpuCoresCount - 1;
+            process.DefaultCpuCore = 3;
 
             context.Processes.TryAdd(process.Pid, process);
 

src/Ryujinx.HLE/HOS/Kernel/Process/KProcess.cs

@@ -277,7 +277,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                 return result;
             }
 
-            result = Capabilities.InitializeForUser(capabilities, MemoryManager, IsApplication);
+            result = Capabilities.InitializeForUser(capabilities, MemoryManager);
 
             if (result != Result.Success)
             {

src/Ryujinx.HLE/HOS/Kernel/Process/KProcessCapabilities.cs

@@ -35,15 +35,15 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
             DebuggingFlags &= ~3u;
             KernelReleaseVersion = KProcess.KernelVersionPacked;
 
-            return Parse(capabilities, memoryManager, false);
+            return Parse(capabilities, memoryManager);
         }
 
-        public Result InitializeForUser(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager, bool isApplication)
+        public Result InitializeForUser(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager)
         {
-            return Parse(capabilities, memoryManager, isApplication);
+            return Parse(capabilities, memoryManager);
         }
 
-        private Result Parse(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager, bool isApplication)
+        private Result Parse(ReadOnlySpan<uint> capabilities, KPageTableBase memoryManager)
         {
             int mask0 = 0;
             int mask1 = 0;
@@ -54,7 +54,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
 
                 if (cap.GetCapabilityType() != CapabilityType.MapRange)
                 {
-                    Result result = ParseCapability(cap, ref mask0, ref mask1, memoryManager, isApplication);
+                    Result result = ParseCapability(cap, ref mask0, ref mask1, memoryManager);
 
                     if (result != Result.Success)
                     {
@@ -120,7 +120,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
             return Result.Success;
         }
 
-        private Result ParseCapability(uint cap, ref int mask0, ref int mask1, KPageTableBase memoryManager, bool isApplication)
+        private Result ParseCapability(uint cap, ref int mask0, ref int mask1, KPageTableBase memoryManager)
         {
             CapabilityType code = cap.GetCapabilityType();
 
@@ -176,9 +176,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Process
                         AllowedCpuCoresMask = GetMaskFromMinMax(lowestCpuCore, highestCpuCore);
                         AllowedThreadPriosMask = GetMaskFromMinMax(lowestThreadPrio, highestThreadPrio);
 
-                        if (isApplication)
-                            Ryujinx.Common.Logging.Logger.Info?.Print(Ryujinx.Common.Logging.LogClass.Application, $"Application requested cores with index range {lowestCpuCore} to {highestCpuCore}");
-
                         break;
                     }
 

src/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs

@@ -2683,7 +2683,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall
                     return KernelResult.InvalidCombination;
                 }
 
-                if ((uint)preferredCore > KScheduler.CpuCoresCount - 1)
+                if ((uint)preferredCore > 3)
                 {
                     if ((preferredCore | 2) != -1)
                     {

src/Ryujinx.HLE/HOS/Kernel/Threading/KScheduler.cs

@@ -9,11 +9,13 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
     partial class KScheduler : IDisposable
     {
         public const int PrioritiesCount = 64;
-        public static int CpuCoresCount;
+        public const int CpuCoresCount = 4;
 
         private const int RoundRobinTimeQuantumMs = 10;
 
-        private static int[] _srcCoresHighestPrioThreads;
+        private static readonly int[] _preemptionPriorities = { 59, 59, 59, 63 };
+
+        private static readonly int[] _srcCoresHighestPrioThreads = new int[CpuCoresCount];
 
         private readonly KernelContext _context;
         private readonly int _coreId;
@@ -45,16 +47,6 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             _coreId = coreId;
 
             _currentThread = null;
-
-            if (_srcCoresHighestPrioThreads == null)
-            {
-                _srcCoresHighestPrioThreads = new int[CpuCoresCount];
-            }
-        }
-
-        private static int PreemptionPriorities(int index)
-        {
-            return index == CpuCoresCount - 1 ? 63 : 59;
         }
 
         public static ulong SelectThreads(KernelContext context)
@@ -445,7 +437,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
                 for (int core = 0; core < CpuCoresCount; core++)
                 {
-                    RotateScheduledQueue(context, core, PreemptionPriorities(core));
+                    RotateScheduledQueue(context, core, _preemptionPriorities[core]);
                 }
 
                 context.CriticalSection.Leave();

src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs

@@ -703,18 +703,6 @@ namespace Ryujinx.HLE.HOS.Services.Hid
             return ResultCode.Success;
         }
 
-        [CommandCmif(92)]
-        // SetGestureOutputRanges(pid, ushort Unknown0)
-        public ResultCode SetGestureOutputRanges(ServiceCtx context)
-        {
-            ulong pid = context.Request.HandleDesc.PId;
-            ushort unknown0 = context.RequestData.ReadUInt16();
-
-            Logger.Stub?.PrintStub(LogClass.ServiceHid, new { pid, unknown0 });
-
-            return ResultCode.Success;
-        }
-
         [CommandCmif(100)]
         // SetSupportedNpadStyleSet(pid, nn::applet::AppletResourceUserId, nn::hid::NpadStyleTag)
         public ResultCode SetSupportedNpadStyleSet(ServiceCtx context)

src/Ryujinx.HLE/HOS/Services/ServerBase.cs

@@ -24,14 +24,14 @@ namespace Ryujinx.HLE.HOS.Services
         // not large enough.
         private const int PointerBufferSize = 0x8000;
 
-        private static uint[] _defaultCapabilities => [
+        private readonly static uint[] _defaultCapabilities = {
-            (((uint)KScheduler.CpuCoresCount - 1) << 24) + (((uint)KScheduler.CpuCoresCount - 1) << 16) + 0x63F7u,
+            0x030363F7,
             0x1FFFFFCF,
             0x207FFFEF,
             0x47E0060F,
             0x0048BFFF,
             0x01007FFF,
-        ];
+        };
 
         // The amount of time Dispose() will wait to Join() the thread executing the ServerLoop()
         private static readonly TimeSpan _threadJoinTimeout = TimeSpan.FromSeconds(3);

src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs

@@ -26,17 +26,7 @@ namespace Ryujinx.HLE.Loaders.Processes
 
         private ulong _latestPid;
 
-        public ProcessResult ActiveApplication
+        public ProcessResult ActiveApplication => _processesByPid[_latestPid];
-        {
-            get
-            {
-                if (!_processesByPid.TryGetValue(_latestPid, out ProcessResult value))
-                    throw new RyujinxException(
-                        $"The HLE Process map did not have a process with ID {_latestPid}. Are you missing firmware?");
-                
-                return value;
-            }
-        }
 
         public ProcessLoader(Switch device)
         {

src/Ryujinx.HLE/Ryujinx.HLE.csproj

@@ -48,7 +48,6 @@
     <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_BtnB.png" />
     <EmbeddedResource Include="HOS\Applets\SoftwareKeyboard\Resources\Icon_KeyF6.png" />
     <EmbeddedResource Include="HOS\Services\Account\Acc\DefaultUserImage.jpg" />
-    <EmbeddedResource Include="HOS\Services\Account\Acc\GuestUserImage.jpg" />
   </ItemGroup>
 
 </Project>

src/Ryujinx.HLE/Switch.cs

@@ -32,8 +32,6 @@ namespace Ryujinx.HLE
         public TamperMachine TamperMachine { get; }
         public IHostUIHandler UIHandler { get; }
 
-        public int CpuCoresCount = 4; //Switch 1 has 4 cores
-
         public VSyncMode VSyncMode { get; set; } = VSyncMode.Switch;
         public bool CustomVSyncIntervalEnabled { get; set; } = false;
         public int CustomVSyncInterval { get; set; }

src/Ryujinx.HLE/UI/IHostUIHandler.cs

@@ -1,5 +1,4 @@
 using Ryujinx.HLE.HOS.Applets;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 
 namespace Ryujinx.HLE.UI
@@ -60,11 +59,5 @@ namespace Ryujinx.HLE.UI
         /// Gets fonts and colors used by the host.
         /// </summary>
         IHostUITheme HostUITheme { get; }
-        
-        
-        /// <summary>
-        /// Displays the player select dialog and returns the selected profile.
-        /// </summary>
-        UserProfile ShowPlayerSelectDialog();
     }
 }

src/Ryujinx.UI.Common/Ryujinx.UI.Common.csproj

@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DefaultItemExcludes>$(DefaultItemExcludes);._*</DefaultItemExcludes>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="Resources\Controller_JoyConLeft.svg" />
+    <None Remove="Resources\Controller_JoyConPair.svg" />
+    <None Remove="Resources\Controller_JoyConRight.svg" />
+    <None Remove="Resources\Controller_ProCon.svg" />
+    <None Remove="Resources\Icon_NCA.png" />
+    <None Remove="Resources\Icon_NRO.png" />
+    <None Remove="Resources\Icon_NSO.png" />
+    <None Remove="Resources\Icon_NSP.png" />
+    <None Remove="Resources\Icon_XCI.png" />
+    <None Remove="Resources\Logo_Amiibo.png" />
+    <None Remove="Resources\Logo_Discord.png" />
+    <None Remove="Resources\Logo_GitHub.png" />
+    <None Remove="Resources\Logo_Ryujinx.png" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="DiscordRichPresence" />
+    <PackageReference Include="DynamicData" />
+    <PackageReference Include="securifybv.ShellLink" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Ryujinx.Common\Ryujinx.Common.csproj" />
+    <ProjectReference Include="..\Ryujinx.HLE\Ryujinx.HLE.csproj" />
+    <ProjectReference Include="..\Ryujinx.Graphics.Vulkan\Ryujinx.Graphics.Vulkan.csproj" />
+  </ItemGroup>
+
+</Project>

src/Ryujinx/AppHost.cs

@@ -489,7 +489,7 @@ namespace Ryujinx.Ava
 
             Dispatcher.UIThread.InvokeAsync(() =>
             {
-                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
+                _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device.Processes.ActiveApplication, Program.Version);
             });
 
             _viewModel.SetUiProgressHandlers(Device);
@@ -872,7 +872,7 @@ namespace Ryujinx.Ava
             Device?.System.TogglePauseEmulation(false);
 
             _viewModel.IsPaused = false;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
         }
 
@@ -881,7 +881,7 @@ namespace Ryujinx.Ava
             Device?.System.TogglePauseEmulation(true);
 
             _viewModel.IsPaused = true;
-            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowTitleBar, LocaleManager.Instance[LocaleKeys.Paused]);
+            _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, LocaleManager.Instance[LocaleKeys.Paused]);
             Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
         }
 

src/Ryujinx/Common/ThemeManager.cs

@@ -4,11 +4,11 @@ namespace Ryujinx.Ava.Common
 {
     public static class ThemeManager
     {
-        public static event Action ThemeChanged;
+        public static event EventHandler ThemeChanged;
 
         public static void OnThemeChanged()
         {
-            ThemeChanged?.Invoke();
+            ThemeChanged?.Invoke(null, EventArgs.Empty);
         }
     }
 }

src/Ryujinx/DiscordIntegrationModule.cs

@@ -1,8 +1,6 @@
 using DiscordRPC;
-using Gommon;
 using Humanizer;
 using Humanizer.Localisation;
-using Ryujinx.Ava.Utilities;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using Ryujinx.Ava.Utilities.Configuration;
 using Ryujinx.Common;
@@ -47,7 +45,16 @@ namespace Ryujinx.Ava
             };
 
             ConfigurationState.Instance.EnableDiscordIntegration.Event += Update;
-            TitleIDs.CurrentApplication.Event += (_, e) => Use(e.NewValue);
+            TitleIDs.CurrentApplication.Event += (_, e) =>
+            {
+                if (e.NewValue)
+                    SwitchToPlayingState(
+                        ApplicationLibrary.LoadAndSaveMetaData(e.NewValue),
+                        Switch.Shared.Processes.ActiveApplication
+                    );
+                else 
+                    SwitchToMainState();
+            };
         }
 
         private static void Update(object sender, ReactiveEventArgs<bool> evnt)
@@ -68,23 +75,11 @@ namespace Ryujinx.Ava
                     _discordClient = new DiscordRpcClient(ApplicationId);
 
                     _discordClient.Initialize();
-
+                    _discordClient.SetPresence(_discordPresenceMain);
-                    Use(TitleIDs.CurrentApplication);
                 }
             }
         }
 
-        public static void Use(Optional<string> titleId)
-        {
-            if (titleId.TryGet(out string tid))
-                SwitchToPlayingState(
-                    ApplicationLibrary.LoadAndSaveMetaData(tid), 
-                    Switch.Shared.Processes.ActiveApplication
-                );
-            else 
-                SwitchToMainState();
-        }
-
         private static void SwitchToPlayingState(ApplicationMetadata appMeta, ProcessResult procRes)
         {
             _discordClient?.SetPresence(new RichPresence
@@ -98,7 +93,7 @@ namespace Ryujinx.Ava
                 },
                 Details = TruncateToByteLength($"Playing {appMeta.Title}"),
                 State = appMeta.LastPlayed.HasValue && appMeta.TimePlayed.TotalSeconds > 5
-                    ? $"Total play time: {ValueFormatUtils.FormatTimeSpan(appMeta.TimePlayed)}"
+                    ? $"Total play time: {appMeta.TimePlayed.Humanize(2, false, maxUnit: TimeUnit.Hour)}"
                     : "Never played",
                 Timestamps = Timestamps.Now
             });

src/Ryujinx/Headless/HeadlessRyujinx.Init.cs

@@ -1,4 +1,4 @@
-using DiscordRPC;
+using DiscordRPC;
 using LibHac.Tools.FsSystem;
 using Ryujinx.Audio.Backends.SDL2;
 using Ryujinx.Ava;

src/Ryujinx/Headless/HeadlessRyujinx.cs

@@ -229,6 +229,8 @@ namespace Ryujinx.Headless
             _enableKeyboard = option.EnableKeyboard;
             _enableMouse = option.EnableMouse;
 
+
+            
             LoadPlayerConfiguration(option.InputProfile1Name, option.InputId1, PlayerIndex.Player1);
             LoadPlayerConfiguration(option.InputProfile2Name, option.InputId2, PlayerIndex.Player2); 
             LoadPlayerConfiguration(option.InputProfile3Name, option.InputId3, PlayerIndex.Player3);
@@ -299,10 +301,7 @@ namespace Ryujinx.Headless
                 _userChannelPersistence.ShouldRestart = false;
             }
 
-            try
+            _inputManager.Dispose();
-            {
-                _inputManager.Dispose();
-            } catch {}
 
             return;
             
@@ -339,12 +338,12 @@ namespace Ryujinx.Headless
         {
             string label = state switch
             {
-                LoadState => "PTC",
+                LoadState => $"PTC : {current}/{total}",
-                ShaderCacheState => "Shaders",
+                ShaderCacheState => $"Shaders : {current}/{total}",
-                _ => throw new ArgumentException($"Unknown Progress Handler type {typeof(T)}")
+                _ => throw new ArgumentException($"Unknown Progress Handler type {typeof(T)}"),
             };
 
-            Logger.Info?.Print(LogClass.Application, $"{label} : {current}/{total}");
+            Logger.Info?.Print(LogClass.Application, label);
         }
 
         private static WindowBase CreateWindow(Options options)

src/Ryujinx/Headless/Metal/MetalWindow.cs

@@ -26,7 +26,7 @@ namespace Ryujinx.Headless
             bool ignoreControllerApplet)
             : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet) { }
 
-        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_METAL;
+        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_METAL;
 
         protected override void InitializeWindowRenderer()
         {

src/Ryujinx/Headless/OpenGL/OpenGLWindow.cs

@@ -109,6 +109,7 @@ namespace Ryujinx.Headless
             }
         }
 
+        private readonly GraphicsDebugLevel _glLogLevel;
         private SDL2OpenGLContext _openGLContext;
 
         public OpenGLWindow(
@@ -120,14 +121,15 @@ namespace Ryujinx.Headless
             bool ignoreControllerApplet)
             : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet)
         {
+            _glLogLevel = glLogLevel;
         }
 
-        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_OPENGL;
+        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_OPENGL;
 
         protected override void InitializeWindowRenderer()
         {
             // Ensure to not share this context with other contexts before this point.
-            SetupOpenGLAttributes(false, GlLogLevel);
+            SetupOpenGLAttributes(false, _glLogLevel);
             nint context = SDL_GL_CreateContext(WindowHandle);
             CheckResult(SDL_GL_SetSwapInterval(1));
 

src/Ryujinx/Headless/StatusUpdatedEventArgs.cs

@@ -0,0 +1,21 @@
+using System;
+
+namespace Ryujinx.Headless
+{
+    class StatusUpdatedEventArgs(
+        string vSyncMode,
+        string dockedMode,
+        string aspectRatio,
+        string gameStatus,
+        string fifoStatus,
+        string gpuName)
+        : EventArgs
+    {
+        public string VSyncMode = vSyncMode;
+        public string DockedMode = dockedMode;
+        public string AspectRatio = aspectRatio;
+        public string GameStatus = gameStatus;
+        public string FifoStatus = fifoStatus;
+        public string GpuName = gpuName;
+    }
+}

src/Ryujinx/Headless/Vulkan/VulkanWindow.cs

@@ -10,6 +10,8 @@ namespace Ryujinx.Headless
 {
     class VulkanWindow : WindowBase
     {
+        private readonly GraphicsDebugLevel _glLogLevel;
+
         public VulkanWindow(
             InputManager inputManager,
             GraphicsDebugLevel glLogLevel,
@@ -19,9 +21,10 @@ namespace Ryujinx.Headless
             bool ignoreControllerApplet)
             : base(inputManager, glLogLevel, aspectRatio, enableMouse, hideCursorMode, ignoreControllerApplet)
         {
+            _glLogLevel = glLogLevel;
         }
 
-        public override SDL_WindowFlags WindowFlags => SDL_WindowFlags.SDL_WINDOW_VULKAN;
+        public override SDL_WindowFlags GetWindowFlags() => SDL_WindowFlags.SDL_WINDOW_VULKAN;
 
         protected override void InitializeWindowRenderer() { }
 

src/Ryujinx/Headless/WindowBase.cs

@@ -1,15 +1,14 @@
 using Humanizer;
+using LibHac.Tools.Fs;
 using Ryujinx.Ava;
-using Ryujinx.Ava.UI.Models;
-using Ryujinx.Common;
 using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Configuration.Hid;
 using Ryujinx.Common.Logging;
 using Ryujinx.Graphics.GAL;
 using Ryujinx.Graphics.GAL.Multithreading;
+using Ryujinx.Graphics.Gpu;
 using Ryujinx.Graphics.OpenGL;
 using Ryujinx.HLE.HOS.Applets;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 using Ryujinx.HLE.UI;
 using Ryujinx.Input;
@@ -27,7 +26,6 @@ using static SDL2.SDL;
 using AntiAliasing = Ryujinx.Common.Configuration.AntiAliasing;
 using ScalingFilter = Ryujinx.Common.Configuration.ScalingFilter;
 using Switch = Ryujinx.HLE.Switch;
-using UserProfile = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;
 
 namespace Ryujinx.Headless
 {
@@ -55,6 +53,8 @@ namespace Ryujinx.Headless
         public Switch Device { get; private set; }
         public IRenderer Renderer { get; private set; }
 
+        public event EventHandler<StatusUpdatedEventArgs> StatusUpdatedEvent;
+
         protected nint WindowHandle { get; set; }
 
         public IHostUITheme HostUITheme { get; }
@@ -72,7 +72,7 @@ namespace Ryujinx.Headless
         protected SDL2MouseDriver MouseDriver;
         private readonly InputManager _inputManager;
         private readonly IKeyboard _keyboardInterface;
-        protected readonly GraphicsDebugLevel GlLogLevel;
+        private readonly GraphicsDebugLevel _glLogLevel;
         private readonly Stopwatch _chrono;
         private readonly long _ticksPerFrame;
         private readonly CancellationTokenSource _gpuCancellationTokenSource;
@@ -104,7 +104,7 @@ namespace Ryujinx.Headless
             NpadManager = _inputManager.CreateNpadManager();
             TouchScreenManager = _inputManager.CreateTouchScreenManager();
             _keyboardInterface = (IKeyboard)_inputManager.KeyboardDriver.GetGamepad("0");
-            GlLogLevel = glLogLevel;
+            _glLogLevel = glLogLevel;
             _chrono = new Stopwatch();
             _ticksPerFrame = Stopwatch.Frequency / TargetFps;
             _gpuCancellationTokenSource = new CancellationTokenSource();
@@ -137,7 +137,7 @@ namespace Ryujinx.Headless
 
         private void SetWindowIcon()
         {
-            Stream iconStream = EmbeddedResources.GetStream("Ryujinx/Assets/UIImages/Logo_Ryujinx.png");
+            Stream iconStream = typeof(Program).Assembly.GetManifestResourceStream("HeadlessLogo");
             byte[] iconBytes = new byte[iconStream!.Length];
 
             if (iconStream.Read(iconBytes, 0, iconBytes.Length) != iconBytes.Length)
@@ -191,7 +191,7 @@ namespace Ryujinx.Headless
                 FullscreenFlag = SDL_WindowFlags.SDL_WINDOW_FULLSCREEN_DESKTOP;
             }
 
-            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), Width, Height, DefaultFlags | FullscreenFlag | WindowFlags);
+            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), SDL_WINDOWPOS_CENTERED_DISPLAY(DisplayId), Width, Height, DefaultFlags | FullscreenFlag | GetWindowFlags());
 
             if (WindowHandle == nint.Zero)
             {
@@ -246,7 +246,7 @@ namespace Ryujinx.Headless
 
         protected abstract void SwapBuffers();
 
-        public abstract SDL_WindowFlags WindowFlags { get; }
+        public abstract SDL_WindowFlags GetWindowFlags();
 
         private string GetGpuDriverName()
         {
@@ -268,7 +268,7 @@ namespace Ryujinx.Headless
         {
             InitializeWindowRenderer();
 
-            Device.Gpu.Renderer.Initialize(GlLogLevel);
+            Device.Gpu.Renderer.Initialize(_glLogLevel);
 
             InitializeRenderer();
 
@@ -308,6 +308,21 @@ namespace Ryujinx.Headless
 
                     if (_ticks >= _ticksPerFrame)
                     {
+                        string dockedMode = Device.System.State.DockedMode ? "Docked" : "Handheld";
+                        float scale = GraphicsConfig.ResScale;
+                        if (scale != 1)
+                        {
+                            dockedMode += $" ({scale}x)";
+                        }
+
+                        StatusUpdatedEvent?.Invoke(this, new StatusUpdatedEventArgs(
+                            Device.VSyncMode.ToString(),
+                            dockedMode,
+                            Device.Configuration.AspectRatio.ToText(),
+                            $"{Device.Statistics.GetGameFrameRate():00.00} FPS ({Device.Statistics.GetGameFrameTime():00.00} ms)",
+                            $"FIFO: {Device.Statistics.GetFifoPercent():0.00} %",
+                            $"GPU: {_gpuDriverName}"));
+
                         _ticks = Math.Min(_ticks - _ticksPerFrame, _ticksPerFrame);
                     }
                 }
@@ -557,10 +572,5 @@ namespace Ryujinx.Headless
                 SDL2Driver.Instance.Dispose();
             }
         }
-        
-        public UserProfile ShowPlayerSelectDialog()
-        {
-            return AccountSaveDataManager.GetLastUsedUser();
-        }
     }
 }

src/Ryujinx/Program.cs

@@ -21,7 +21,6 @@ using Ryujinx.Graphics.Vulkan.MoltenVK;
 using Ryujinx.Headless;
 using Ryujinx.SDL2.Common;
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -244,33 +243,16 @@ namespace Ryujinx.Ava
                     : $"Launch Mode: {AppDataManager.Mode}");
         }
 
-        internal static void ProcessUnhandledException(object sender, Exception initialException, bool isTerminating)
+        internal static void ProcessUnhandledException(object sender, Exception ex, bool isTerminating)
         {
             Logger.Log log = Logger.Error ?? Logger.Notice;
+            string message = $"Unhandled exception caught: {ex}";
 
-            List<Exception> exceptions = [];
+            // ReSharper disable once ConstantConditionalAccessQualifier
-
+            if (sender?.GetType()?.AsPrettyString() is { } senderName)
-            if (initialException is AggregateException ae)
+                log.Print(LogClass.Application, message, senderName);
-            {
-                exceptions.AddRange(ae.InnerExceptions);
-            }
             else
-            {
+                log.PrintMsg(LogClass.Application, message);
-                exceptions.Add(initialException);
-            }
-
-            foreach (var e in exceptions)
-            {
-                string message = $"Unhandled exception caught: {e}";
-                // ReSharper disable once ConstantConditionalAccessQualifier
-                if (sender?.GetType()?.AsPrettyString() is { } senderName)
-                    log.Print(LogClass.Application, message, senderName);
-                else
-                    log.PrintMsg(LogClass.Application, message);
-            }
-            
-
-
 
             if (isTerminating)
                 Exit();

src/Ryujinx/Ryujinx.csproj

@@ -166,6 +166,7 @@
     <EmbeddedResource Include="Assets\UIImages\Logo_GitHub_Light.png" />
     <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx.png" />
     <EmbeddedResource Include="Assets\UIImages\Logo_Ryujinx_AntiAlias.png" />
+    <EmbeddedResource Include="Headless\Ryujinx.bmp" LogicalName="HeadlessLogo" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="Assets\locales.json" />
@@ -173,10 +174,4 @@
   <ItemGroup>
     <Folder Include="Assets\Fonts\Mono\" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="UI\Applet\UserSelectorDialog.axaml.cs">
-      <DependentUpon>UserSelectorDialog.axaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
 </Project>

src/Ryujinx/UI/Applet/AvaHostUIHandler.cs

@@ -1,24 +1,17 @@
 using Avalonia.Controls;
 using Avalonia.Threading;
 using FluentAvalonia.UI.Controls;
-using Gommon;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
 using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.ViewModels.Input;
 using Ryujinx.Ava.UI.Windows;
 using Ryujinx.Ava.Utilities.Configuration;
-using Ryujinx.Common;
 using Ryujinx.HLE;
 using Ryujinx.HLE.HOS.Applets;
 using Ryujinx.HLE.HOS.Applets.SoftwareKeyboard;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
 using Ryujinx.HLE.UI;
 using System;
-using System.Collections.ObjectModel;
-using System.Linq;
 using System.Threading;
 
 namespace Ryujinx.Ava.UI.Applet
@@ -260,59 +253,5 @@ namespace Ryujinx.Ava.UI.Applet
         }
 
         public IDynamicTextInputHandler CreateDynamicTextInputHandler() => new AvaloniaDynamicTextInputHandler(_parent);
-        
-        public UserProfile ShowPlayerSelectDialog()
-        {
-            UserId selected = UserId.Null;
-            byte[] defaultGuestImage = EmbeddedResources.Read("Ryujinx.HLE/HOS/Services/Account/Acc/GuestUserImage.jpg");
-            UserProfile guest = new UserProfile(new UserId("00000000000000000000000000000080"), "Guest", defaultGuestImage);
-    
-            ManualResetEvent dialogCloseEvent = new(false);
-    
-            Dispatcher.UIThread.InvokeAsync(async () =>
-            {
-                ObservableCollection<BaseModel> profiles = [];
-                NavigationDialogHost nav = new();
-                
-                _parent.AccountManager.GetAllUsers()
-                    .OrderBy(x => x.Name)
-                    .ForEach(profile => profiles.Add(new Models.UserProfile(profile, nav)));
-                
-                profiles.Add(new Models.UserProfile(guest, nav));
-                UserSelectorDialogViewModel viewModel = new()
-                {
-                    Profiles = profiles, 
-                    SelectedUserId = _parent.AccountManager.LastOpenedUser.UserId
-                };
-                UserSelectorDialog content = new(viewModel);
-                (selected, _) = await UserSelectorDialog.ShowInputDialog(content);
-        
-                dialogCloseEvent.Set();
-            });
-    
-            dialogCloseEvent.WaitOne();
-            
-            UserProfile profile = _parent.AccountManager.LastOpenedUser;
-            if (selected == guest.UserId)
-            {
-                profile = guest;
-            }
-            else if (selected == UserId.Null)
-            {
-                profile = null;
-            }
-            else
-            {
-                foreach (UserProfile p in _parent.AccountManager.GetAllUsers())
-                {
-                    if (p.UserId == selected)
-                    {
-                        profile = p;
-                        break;
-                    }
-                }
-            }
-            return profile;
-        }
     }
 }

src/Ryujinx/UI/Applet/UserSelectorDialog.axaml

@@ -1,121 +0,0 @@
-<UserControl
-    x:Class="Ryujinx.Ava.UI.Applet.UserSelectorDialog"
-    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:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
-    xmlns:models="clr-namespace:Ryujinx.Ava.UI.Models"
-    xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
-    d:DesignHeight="450"
-    MinWidth="500"
-    d:DesignWidth="800"
-    mc:Ignorable="d"
-    Focusable="True"
-    x:DataType="viewModels:UserSelectorDialogViewModel">
-    
-    <UserControl.Resources>
-        <helpers:BitmapArrayValueConverter x:Key="ByteImage" />
-    </UserControl.Resources>
-    
-    <Design.DataContext>
-        <viewModels:UserSelectorDialogViewModel />
-    </Design.DataContext>
-    
-    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        
-        <Border
-            CornerRadius="5"
-            BorderBrush="{DynamicResource AppListHoverBackgroundColor}"
-            BorderThickness="1">
-            
-            <ListBox
-                MaxHeight="300"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                ItemsSource="{Binding Profiles}"
-                SelectionChanged="ProfilesList_SelectionChanged">
-                
-                <ListBox.ItemsPanel>
-                    <ItemsPanelTemplate>
-                        <WrapPanel
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Orientation="Horizontal" />
-                    </ItemsPanelTemplate>
-                </ListBox.ItemsPanel>
-                
-                <ListBox.Styles>
-                    <Style Selector="ListBoxItem">
-                        <Setter Property="Margin" Value="5 5 0 5" />
-                        <Setter Property="CornerRadius" Value="5" />
-                    </Style>
-                    <Style Selector="Rectangle#SelectionIndicator">
-                        <Setter Property="Opacity" Value="0" />
-                    </Style>
-                </ListBox.Styles>
-                
-                <ListBox.DataTemplates>
-                    <DataTemplate
-                        DataType="models:UserProfile">
-                        <Grid
-                            PointerEntered="Grid_PointerEntered"
-                            PointerExited="Grid_OnPointerExited">
-                            <Border
-                                HorizontalAlignment="Stretch"
-                                VerticalAlignment="Stretch"
-                                ClipToBounds="True"
-                                CornerRadius="5"
-                                Background="{Binding BackgroundColor}">
-                                <StackPanel
-                                    HorizontalAlignment="Stretch"
-                                    VerticalAlignment="Stretch">
-                                    <Image
-                                        Width="96"
-                                        Height="96"
-                                        HorizontalAlignment="Stretch"
-                                        VerticalAlignment="Top"
-                                        Source="{Binding Image, Converter={StaticResource ByteImage}}" />
-                                    <TextBlock
-                                        HorizontalAlignment="Stretch"
-                                        MaxWidth="90"
-                                        Text="{Binding Name}"
-                                        TextAlignment="Center"
-                                        TextWrapping="Wrap"
-                                        TextTrimming="CharacterEllipsis"
-                                        MaxLines="2"
-                                        Margin="5" />
-                                </StackPanel>
-                            </Border>
-                        </Grid>
-                    </DataTemplate>
-                    <DataTemplate
-                        DataType="viewModels:BaseModel">
-                        <Panel
-                            Height="118"
-                            Width="96">
-                            <Panel.Styles>
-                                <Style Selector="Panel">
-                                    <Setter Property="Background" Value="{DynamicResource ListBoxBackground}" />
-                                </Style>
-                            </Panel.Styles>
-                        </Panel>
-                    </DataTemplate>
-                </ListBox.DataTemplates>
-            </ListBox>
-        </Border>
-        
-        <StackPanel
-            Grid.Row="1"
-            Margin="0 24 0 0"
-            HorizontalAlignment="Left"
-            Orientation="Horizontal"
-            Spacing="10">
-        </StackPanel>
-    </Grid>
-</UserControl>

src/Ryujinx/UI/Applet/UserSelectorDialog.axaml.cs

@@ -1,123 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Input;
-using FluentAvalonia.UI.Controls;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Ava.UI.Controls;
-using Ryujinx.Ava.UI.Helpers;
-using Ryujinx.Ava.UI.ViewModels;
-using Ryujinx.Ava.UI.ViewModels.Input;
-using Ryujinx.Common.Logging;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
-using UserProfile = Ryujinx.Ava.UI.Models.UserProfile;
-using UserProfileSft = Ryujinx.HLE.HOS.Services.Account.Acc.UserProfile;
-
-namespace Ryujinx.Ava.UI.Applet
-{
-    public partial class UserSelectorDialog : UserControl, INotifyPropertyChanged
-    {
-        public UserSelectorDialogViewModel ViewModel { get; set; }
-
-        public UserSelectorDialog(UserSelectorDialogViewModel viewModel)
-        {
-            InitializeComponent();
-            ViewModel = viewModel;
-            DataContext = ViewModel;
-        }
-        
-        private void Grid_PointerEntered(object sender, PointerEventArgs e)
-        {
-            if (sender is Grid { DataContext: UserProfile profile })
-            {
-                profile.IsPointerOver = true;
-            }
-        }
-
-        private void Grid_OnPointerExited(object sender, PointerEventArgs e)
-        {
-            if (sender is Grid { DataContext: UserProfile profile })
-            {
-                profile.IsPointerOver = false;
-            }
-        }
-
-        private void ProfilesList_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (sender is ListBox listBox)
-            {
-                int selectedIndex = listBox.SelectedIndex;
-
-                if (selectedIndex >= 0 && selectedIndex < ViewModel.Profiles.Count)
-                {
-                    if (ViewModel.Profiles[selectedIndex] is UserProfile userProfile)
-                    {
-                        ViewModel.SelectedUserId = userProfile.UserId;
-                        Logger.Info?.Print(LogClass.UI, $"Selected user: {userProfile.UserId}");
-
-                        ObservableCollection<BaseModel> newProfiles = [];
-
-                        foreach (var item in ViewModel.Profiles)
-                        {
-                            if (item is UserProfile originalItem)
-                            {
-                                var profile = new UserProfileSft(originalItem.UserId, originalItem.Name, originalItem.Image);
-                                
-                                if (profile.UserId == ViewModel.SelectedUserId)
-                                {
-                                    profile.AccountState = AccountState.Open;
-                                }
-
-                                newProfiles.Add(new UserProfile(profile, new NavigationDialogHost()));
-                            }
-                        }
-
-                        ViewModel.Profiles = newProfiles;
-                    }
-                }
-            }
-        }
-
-        public static async Task<(UserId Id, bool Result)> ShowInputDialog(UserSelectorDialog content)
-        {
-            ContentDialog contentDialog = new()
-            {
-                Title = LocaleManager.Instance[LocaleKeys.UserProfileWindowTitle],
-                PrimaryButtonText = LocaleManager.Instance[LocaleKeys.Continue],
-                SecondaryButtonText = string.Empty,
-                CloseButtonText = LocaleManager.Instance[LocaleKeys.Cancel],
-                Content = content,
-                Padding = new Thickness(0)
-            };
-
-            UserId result = UserId.Null;
-            bool input = false;
-
-            void Handler(ContentDialog sender, ContentDialogClosedEventArgs eventArgs)
-            {
-                if (eventArgs.Result == ContentDialogResult.Primary)
-                {
-                    if (contentDialog.Content is UserSelectorDialog view)
-                    {
-                        result = view.ViewModel.SelectedUserId;
-                        input = true;
-                    }
-                }
-                else
-                {
-                    result = UserId.Null;
-                    input = false;
-                }
-            }
-
-            contentDialog.Closed += Handler;
-
-            await ContentDialogHelper.ShowAsync(contentDialog);
-
-            return (result, input);
-        }
-    }
-}

src/Ryujinx/UI/Controls/ApplicationListView.axaml

@@ -133,13 +133,12 @@
                                     Spacing="5">
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
-                                        Text="{Binding LastPlayedString}"
+                                        Text="{Binding TimePlayedString}"
                                         TextAlignment="End"
                                         TextWrapping="Wrap" />
                                     <TextBlock
                                         HorizontalAlignment="Stretch"
-                                        Text="{Binding TimePlayedString}"
+                                        Text="{Binding LastPlayedString}"
-                                        IsVisible="{Binding HasPlayedPreviously}"
                                         TextAlignment="End"
                                         TextWrapping="Wrap" />
                                     <TextBlock

src/Ryujinx/UI/Controls/UpdateWaitWindow.axaml

@@ -7,7 +7,6 @@
     Title="Ryujinx - Waiting"
     SizeToContent="WidthAndHeight"
     WindowStartupLocation="CenterOwner"
-    CanResize="False"
     mc:Ignorable="d"
     Focusable="True">
     <Grid

src/Ryujinx/UI/Helpers/Commands.cs

@@ -1,48 +0,0 @@
-using CommunityToolkit.Mvvm.Input;
-using System;
-using System.Threading.Tasks;
-
-namespace Ryujinx.Ava.UI.Helpers
-{
-#nullable enable
-    public static class Commands
-    {
-        public static RelayCommand Create(Action action)
-            => new(action);
-        public static RelayCommand CreateConditional(Action action, Func<bool> canExecute)
-            => new(action, canExecute);
-        
-        public static RelayCommand<T> CreateWithArg<T>(Action<T?> action)
-            => new(action);
-        public static RelayCommand<T> CreateConditionalWithArg<T>(Action<T?> action, Predicate<T?> canExecute)
-            => new(action, canExecute);
-
-        public static AsyncRelayCommand Create(Func<Task> action)
-            => new(action, AsyncRelayCommandOptions.None);
-        public static AsyncRelayCommand CreateConcurrent(Func<Task> action)
-            => new(action, AsyncRelayCommandOptions.AllowConcurrentExecutions);
-        public static AsyncRelayCommand CreateSilentFail(Func<Task> action)
-            => new(action, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
-        
-        public static AsyncRelayCommand<T> CreateWithArg<T>(Func<T?, Task> action)
-            => new(action, AsyncRelayCommandOptions.None);
-        public static AsyncRelayCommand<T> CreateConcurrentWithArg<T>(Func<T?, Task> action)
-            => new(action, AsyncRelayCommandOptions.AllowConcurrentExecutions);
-        public static AsyncRelayCommand<T> CreateSilentFailWithArg<T>(Func<T?, Task> action)
-            => new(action, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
-
-        public static AsyncRelayCommand CreateConditional(Func<Task> action, Func<bool> canExecute)
-            => new(action, canExecute, AsyncRelayCommandOptions.None);
-        public static AsyncRelayCommand CreateConcurrentConditional(Func<Task> action, Func<bool> canExecute)
-            => new(action, canExecute, AsyncRelayCommandOptions.AllowConcurrentExecutions);
-        public static AsyncRelayCommand CreateSilentFailConditional(Func<Task> action, Func<bool> canExecute)
-            => new(action, canExecute, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
-        
-        public static AsyncRelayCommand<T> CreateConditionalWithArg<T>(Func<T?, Task> action, Predicate<T?> canExecute)
-            => new(action, canExecute, AsyncRelayCommandOptions.None);
-        public static AsyncRelayCommand<T> CreateConcurrentConditionalWithArg<T>(Func<T?, Task> action, Predicate<T?> canExecute)
-            => new(action, canExecute, AsyncRelayCommandOptions.AllowConcurrentExecutions);
-        public static AsyncRelayCommand<T> CreateSilentFailConditionalWithArg<T>(Func<T?, Task> action, Predicate<T?> canExecute)
-            => new(action, canExecute, AsyncRelayCommandOptions.FlowExceptionsToTaskScheduler);
-    }
-}

src/Ryujinx/UI/Helpers/PlayabilityStatusConverter.cs

@@ -12,8 +12,8 @@ namespace Ryujinx.Ava.UI.Helpers
         private static readonly Lazy<PlayabilityStatusConverter> _shared = new(() => new());
         public static PlayabilityStatusConverter Shared => _shared.Value;
 
-        public object Convert(object value, Type _, object __, CultureInfo ___)
+        public object Convert(object? value, Type _, object? __, CultureInfo ___) =>
-            => value.Cast<LocaleKeys>() switch
+            value.Cast<LocaleKeys>() switch
             {
                 LocaleKeys.CompatibilityListNothing or 
                     LocaleKeys.CompatibilityListBoots or 
@@ -22,7 +22,7 @@ namespace Ryujinx.Ava.UI.Helpers
                 _ => Brushes.ForestGreen
             };
 
-        public object ConvertBack(object value, Type _, object __, CultureInfo ___)
+        public object ConvertBack(object? value, Type _, object? __, CultureInfo ___) 
             => throw new NotSupportedException();
     }
 }

src/Ryujinx/UI/Models/Input/HotkeyConfig.cs

@@ -1,53 +1,152 @@
-using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Configuration.Hid;
 
 namespace Ryujinx.Ava.UI.Models.Input
 {
-    public partial class HotkeyConfig : BaseModel
+    public class HotkeyConfig : BaseModel
     {
-        [ObservableProperty] private Key _toggleVSyncMode;
+        private Key _toggleVSyncMode;
+        public Key ToggleVSyncMode
+        {
+            get => _toggleVSyncMode;
+            set
+            {
+                _toggleVSyncMode = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _screenshot;
+        private Key _screenshot;
+        public Key Screenshot
+        {
+            get => _screenshot;
+            set
+            {
+                _screenshot = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _showUI;
+        private Key _showUI;
+        public Key ShowUI
+        {
+            get => _showUI;
+            set
+            {
+                _showUI = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _pause;
+        private Key _pause;
+        public Key Pause
+        {
+            get => _pause;
+            set
+            {
+                _pause = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _toggleMute;
+        private Key _toggleMute;
+        public Key ToggleMute
+        {
+            get => _toggleMute;
+            set
+            {
+                _toggleMute = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _resScaleUp;
+        private Key _resScaleUp;
+        public Key ResScaleUp
+        {
+            get => _resScaleUp;
+            set
+            {
+                _resScaleUp = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _resScaleDown;
+        private Key _resScaleDown;
+        public Key ResScaleDown
+        {
+            get => _resScaleDown;
+            set
+            {
+                _resScaleDown = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _volumeUp;
+        private Key _volumeUp;
+        public Key VolumeUp
+        {
+            get => _volumeUp;
+            set
+            {
+                _volumeUp = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _volumeDown;
+        private Key _volumeDown;
+        public Key VolumeDown
+        {
+            get => _volumeDown;
+            set
+            {
+                _volumeDown = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _customVSyncIntervalIncrement;
+        private Key _customVSyncIntervalIncrement;
+        public Key CustomVSyncIntervalIncrement
+        {
+            get => _customVSyncIntervalIncrement;
+            set
+            {
+                _customVSyncIntervalIncrement = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private Key _customVSyncIntervalDecrement;
+        private Key _customVSyncIntervalDecrement;
+        public Key CustomVSyncIntervalDecrement
+        {
+            get => _customVSyncIntervalDecrement;
+            set
+            {
+                _customVSyncIntervalDecrement = value;
+                OnPropertyChanged();
+            }
+        }
 
         public HotkeyConfig(KeyboardHotkeys config)
         {
-            if (config == null)
+            if (config != null)
-                return;
+            {
-
+                ToggleVSyncMode = config.ToggleVSyncMode;
-            ToggleVSyncMode = config.ToggleVSyncMode;
+                Screenshot = config.Screenshot;
-            Screenshot = config.Screenshot;
+                ShowUI = config.ShowUI;
-            ShowUI = config.ShowUI;
+                Pause = config.Pause;
-            Pause = config.Pause;
+                ToggleMute = config.ToggleMute;
-            ToggleMute = config.ToggleMute;
+                ResScaleUp = config.ResScaleUp;
-            ResScaleUp = config.ResScaleUp;
+                ResScaleDown = config.ResScaleDown;
-            ResScaleDown = config.ResScaleDown;
+                VolumeUp = config.VolumeUp;
-            VolumeUp = config.VolumeUp;
+                VolumeDown = config.VolumeDown;
-            VolumeDown = config.VolumeDown;
+                CustomVSyncIntervalIncrement = config.CustomVSyncIntervalIncrement;
-            CustomVSyncIntervalIncrement = config.CustomVSyncIntervalIncrement;
+                CustomVSyncIntervalDecrement = config.CustomVSyncIntervalDecrement;
-            CustomVSyncIntervalDecrement = config.CustomVSyncIntervalDecrement;
+            }
         }
 
-        public KeyboardHotkeys GetConfig() =>
+        public KeyboardHotkeys GetConfig()
-            new()
+        {
+            var config = new KeyboardHotkeys
             {
                 ToggleVSyncMode = ToggleVSyncMode,
                 Screenshot = Screenshot,
@@ -61,5 +160,8 @@ namespace Ryujinx.Ava.UI.Models.Input
                 CustomVSyncIntervalIncrement = CustomVSyncIntervalIncrement,
                 CustomVSyncIntervalDecrement = CustomVSyncIntervalDecrement,
             };
+
+            return config;
+        }
     }
 }

src/Ryujinx/UI/Models/StatusUpdatedEventArgs.cs

@@ -22,22 +22,5 @@ namespace Ryujinx.Ava.UI.Models
             FifoStatus = fifoStatus;
             ShaderCount = shaderCount;
         }
-
-
-        public override bool Equals(object obj)
-        {
-            if (obj is not StatusUpdatedEventArgs suea) return false;
-            return
-                VSyncMode == suea.VSyncMode &&
-                VolumeStatus == suea.VolumeStatus &&
-                DockedMode == suea.DockedMode &&
-                AspectRatio == suea.AspectRatio &&
-                GameStatus == suea.GameStatus &&
-                FifoStatus == suea.FifoStatus &&
-                ShaderCount == suea.ShaderCount;
-        }
-
-        public override int GetHashCode() 
-            => HashCode.Combine(VSyncMode, VolumeStatus, AspectRatio, DockedMode, FifoStatus, GameStatus, ShaderCount);
     }
 }

src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs

@@ -27,7 +27,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             ThemeManager.ThemeChanged += ThemeManager_ThemeChanged;
         }
 
-        private void ThemeManager_ThemeChanged()
+        private void ThemeManager_ThemeChanged(object sender, EventArgs e)
         {
             Dispatcher.UIThread.Post(() => UpdateLogoTheme(ConfigurationState.Instance.UI.BaseStyle.Value));
         }

src/Ryujinx/UI/ViewModels/Input/ControllerInputViewModel.cs

@@ -1,13 +1,21 @@
 using Avalonia.Svg.Skia;
-using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.Views.Input;
 
 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public partial class ControllerInputViewModel : BaseModel
+    public class ControllerInputViewModel : BaseModel
     {
-        [ObservableProperty] private GamepadInputConfig _config;
+        private GamepadInputConfig _config;
+        public GamepadInputConfig Config
+        {
+            get => _config;
+            set
+            {
+                _config = value;
+                OnPropertyChanged();
+            }
+        }
 
         private bool _isLeft;
         public bool IsLeft
@@ -35,7 +43,16 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public bool HasSides => IsLeft ^ IsRight;
 
-        [ObservableProperty] private SvgImage _image;
+        private SvgImage _image;
+        public SvgImage Image
+        {
+            get => _image;
+            set
+            {
+                _image = value;
+                OnPropertyChanged();
+            }
+        }
 
         public readonly InputViewModel ParentModel;
 

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -1,8 +1,9 @@
+using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 using Avalonia.Svg.Skia;
 using Avalonia.Threading;
-using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.Input;
 using Ryujinx.Ava.UI.Helpers;
@@ -31,7 +32,7 @@ using Key = Ryujinx.Common.Configuration.Hid.Key;
 
 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public partial class InputViewModel : BaseModel, IDisposable
+    public class InputViewModel : BaseModel, IDisposable
     {
         private const string Disabled = "disabled";
         private const string ProControllerResource = "Ryujinx/Assets/Icons/Controller_ProCon.svg";
@@ -47,8 +48,8 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         private int _controller;
         private string _controllerImage;
         private int _device;
-        [ObservableProperty] private object _configViewModel;
+        private object _configViewModel;
-        [ObservableProperty] private string _profileName;
+        private string _profileName;
         private bool _isLoaded;
 
         private static readonly InputConfigJsonSerializerContext _serializerContext = new(JsonHelper.GetDefaultSerializerOptions());
@@ -72,6 +73,17 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
         public bool IsModified { get; set; }
         public event Action NotifyChangesEvent;
 
+        public object ConfigViewModel
+        {
+            get => _configViewModel;
+            set
+            {
+                _configViewModel = value;
+
+                OnPropertyChanged();
+            }
+        }
+
         public PlayerIndex PlayerIdChoose
         {
             get => _playerIdChoose;
@@ -188,6 +200,16 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             }
         }
 
+        public string ProfileName
+        {
+            get => _profileName; set
+            {
+                _profileName = value;
+
+                OnPropertyChanged();
+            }
+        }
+
         public int Device
         {
             get => _device;

src/Ryujinx/UI/ViewModels/Input/KeyboardInputViewModel.cs

@@ -1,12 +1,20 @@
 using Avalonia.Svg.Skia;
-using CommunityToolkit.Mvvm.ComponentModel;
 using Ryujinx.Ava.UI.Models.Input;
 
 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public partial class KeyboardInputViewModel : BaseModel
+    public class KeyboardInputViewModel : BaseModel
     {
-        [ObservableProperty] private KeyboardInputConfig _config;
+        private KeyboardInputConfig _config;
+        public KeyboardInputConfig Config
+        {
+            get => _config;
+            set
+            {
+                _config = value;
+                OnPropertyChanged();
+            }
+        }
 
         private bool _isLeft;
         public bool IsLeft
@@ -34,7 +42,16 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public bool HasSides => IsLeft ^ IsRight;
 
-        [ObservableProperty] private SvgImage _image;
+        private SvgImage _image;
+        public SvgImage Image
+        {
+            get => _image;
+            set
+            {
+                _image = value;
+                OnPropertyChanged();
+            }
+        }
 
         public readonly InputViewModel ParentModel;
 

src/Ryujinx/UI/ViewModels/Input/MotionInputViewModel.cs

@@ -1,23 +1,93 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public partial class MotionInputViewModel : BaseModel
+    public class MotionInputViewModel : BaseModel
     {
-        [ObservableProperty] private int _slot;
+        private int _slot;
+        public int Slot
+        {
+            get => _slot;
+            set
+            {
+                _slot = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private int _altSlot;
+        private int _altSlot;
+        public int AltSlot
+        {
+            get => _altSlot;
+            set
+            {
+                _altSlot = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private string _dsuServerHost;
+        private string _dsuServerHost;
+        public string DsuServerHost
+        {
+            get => _dsuServerHost;
+            set
+            {
+                _dsuServerHost = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private int _dsuServerPort;
+        private int _dsuServerPort;
+        public int DsuServerPort
+        {
+            get => _dsuServerPort;
+            set
+            {
+                _dsuServerPort = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private bool _mirrorInput;
+        private bool _mirrorInput;
+        public bool MirrorInput
+        {
+            get => _mirrorInput;
+            set
+            {
+                _mirrorInput = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private int _sensitivity;
+        private int _sensitivity;
+        public int Sensitivity
+        {
+            get => _sensitivity;
+            set
+            {
+                _sensitivity = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private double _gyroDeadzone;
+        private double _gryoDeadzone;
+        public double GyroDeadzone
+        {
+            get => _gryoDeadzone;
+            set
+            {
+                _gryoDeadzone = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private bool _enableCemuHookMotion;
+        private bool _enableCemuHookMotion;
+        public bool EnableCemuHookMotion
+        {
+            get => _enableCemuHookMotion;
+            set
+            {
+                _enableCemuHookMotion = value;
+                OnPropertyChanged();
+            }
+        }
     }
 }

src/Ryujinx/UI/ViewModels/Input/RumbleInputViewModel.cs

@@ -1,11 +1,27 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-
 namespace Ryujinx.Ava.UI.ViewModels.Input
 {
-    public partial class RumbleInputViewModel : BaseModel
+    public class RumbleInputViewModel : BaseModel
     {
-        [ObservableProperty] private float _strongRumble;
+        private float _strongRumble;
+        public float StrongRumble
+        {
+            get => _strongRumble;
+            set
+            {
+                _strongRumble = value;
+                OnPropertyChanged();
+            }
+        }
 
-        [ObservableProperty] private float _weakRumble;
+        private float _weakRumble;
+        public float WeakRumble
+        {
+            get => _weakRumble;
+            set
+            {
+                _weakRumble = value;
+                OnPropertyChanged();
+            }
+        }
     }
 }

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -38,6 +38,7 @@ using Ryujinx.HLE.HOS.Services.Account.Acc;
 using Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption;
 using Ryujinx.HLE.UI;
 using Ryujinx.Input.HLE;
+using Silk.NET.Vulkan;
 using SkiaSharp;
 using System;
 using System.Collections.Generic;
@@ -740,10 +741,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             Applications.ToObservableChangeSet()
                 .Filter(Filter)
                 .Sort(GetComparer())
-#pragma warning disable MVVMTK0034
+                .Bind(out _appsObservableList).AsObservableList();
-                .Bind(out _appsObservableList)
-#pragma warning restore MVVMTK0034
-                .AsObservableList();
 
             OnPropertyChanged(nameof(AppsObservableList));
         }

src/Ryujinx/UI/ViewModels/UserSelectorDialogViewModel.cs

@@ -1,14 +0,0 @@
-using CommunityToolkit.Mvvm.ComponentModel;
-using Ryujinx.HLE.HOS.Services.Account.Acc;
-using System.Collections.ObjectModel;
-
-namespace Ryujinx.Ava.UI.ViewModels
-{
-    public partial class UserSelectorDialogViewModel : BaseModel
-    {
-
-        [ObservableProperty] private UserId _selectedUserId;
-
-        [ObservableProperty] private ObservableCollection<BaseModel> _profiles = [];
-    }
-}

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -43,13 +43,7 @@ namespace Ryujinx.Ava.UI.Views.Main
             PauseEmulationMenuItem.Command = new RelayCommand(() => ViewModel.AppHost?.Pause());
             ResumeEmulationMenuItem.Command = new RelayCommand(() => ViewModel.AppHost?.Resume());
             StopEmulationMenuItem.Command = new AsyncRelayCommand(() => ViewModel.AppHost?.ShowExitPrompt().OrCompleted());
-            CheatManagerMenuItem.Command = new AsyncRelayCommand(async () =>
+            CheatManagerMenuItem.Command = new AsyncRelayCommand(OpenCheatManagerForCurrentApp);
-            {
-                try
-                {
-                    await OpenCheatManagerForCurrentApp();
-                } catch {}
-            });
             InstallFileTypesMenuItem.Command = new AsyncRelayCommand(InstallFileTypes);
             UninstallFileTypesMenuItem.Command = new AsyncRelayCommand(UninstallFileTypes);
             XciTrimmerMenuItem.Command = new AsyncRelayCommand(() => XCITrimmerWindow.Show(ViewModel));
@@ -144,14 +138,14 @@ namespace Ryujinx.Ava.UI.Views.Main
             ViewModel.LoadConfigurableHotKeys();
         }
 
-        public AppletMetadata MiiApplet => new(ViewModel.ContentManager, "miiEdit", 0x0100000000001009);
+        public static readonly AppletMetadata MiiApplet = new("miiEdit", 0x0100000000001009);
 
         public async Task OpenMiiApplet()
         {
-            if (!MiiApplet.CanStart(out var appData, out var nacpData)) 
+            if (MiiApplet.CanStart(ViewModel.ContentManager, out var appData, out var nacpData))
-                return;
+            {
-            
+                await ViewModel.LoadApplication(appData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
-            await ViewModel.LoadApplication(appData, ViewModel.IsFullScreen || ViewModel.StartGamesInFullscreen, nacpData);
+            }
         }
 
         public async Task OpenCheatManagerForCurrentApp()

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml

@@ -136,12 +136,6 @@
                             <ComboBoxItem>
                                 <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageBrazilianPortuguese}" />
                             </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageSwedish}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale SettingsTabSystemSystemLanguageNorwegian}" />
-                            </ComboBoxItem>
                         </ComboBox>
                     </StackPanel>
                     <StackPanel

src/Ryujinx/UI/Windows/MainWindow.axaml.cs

@@ -32,7 +32,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reactive.Linq;
-using System.Runtime.InteropServices;
 using System.Runtime.Versioning;
 using System.Threading;
 using System.Threading.Tasks;
@@ -137,8 +136,6 @@ namespace Ryujinx.Ava.UI.Windows
             base.OnApplyTemplate(e);
 
             NotificationHelper.SetNotificationManager(this);
-
-            Executor.ExecuteBackgroundAsync(ShowIntelMacWarningAsync);
         }
 
         private void OnScalingChanged(object sender, EventArgs e)
@@ -167,7 +164,7 @@ namespace Ryujinx.Ava.UI.Windows
             });
         }
 
-        private void ApplicationLibrary_LdnGameDataReceived(LdnGameDataReceivedEventArgs e)
+        private void ApplicationLibrary_LdnGameDataReceived(object sender, LdnGameDataReceivedEventArgs e)
         {
             Dispatcher.UIThread.Post(() =>
             {
@@ -411,10 +408,13 @@ namespace Ryujinx.Ava.UI.Windows
         {
             StatusBarView.VolumeStatus.Click += VolumeStatus_CheckedChanged;
 
-            ApplicationGrid.DataContext = ApplicationList.DataContext = ViewModel;
-            
             ApplicationGrid.ApplicationOpened += Application_Opened;
+
+            ApplicationGrid.DataContext = ViewModel;
+
             ApplicationList.ApplicationOpened += Application_Opened;
+
+            ApplicationList.DataContext = ViewModel;
         }
 
         private void SetWindowSizePosition()
@@ -734,20 +734,5 @@ namespace Ryujinx.Ava.UI.Windows
                     (int)Symbol.Checkmark);
             });
         }
-
-        private static bool _intelMacWarningShown = !(OperatingSystem.IsMacOS() &&
-                                                     (RuntimeInformation.OSArchitecture == Architecture.X64 ||
-                                                      RuntimeInformation.OSArchitecture == Architecture.X86));
-
-        public static async Task ShowIntelMacWarningAsync()
-        {
-            if (_intelMacWarningShown) return;
-            
-            await Dispatcher.UIThread.InvokeAsync(async () => await ContentDialogHelper.CreateWarningDialog(
-                "Intel Mac Warning",
-                "Intel Macs are not supported and will not work properly.\nIf you continue, do not come to our Discord asking for support;\nand do not report bugs on the GitHub. They will be closed."));
-
-            _intelMacWarningShown = true;
-        }
     }
 }

src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs

@@ -1,6 +1,4 @@
-using Avalonia;
 using Avalonia.Controls;
-using Avalonia.Input;
 using FluentAvalonia.Core;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
@@ -25,11 +23,6 @@ namespace Ryujinx.Ava.UI.Windows
 
             InitializeComponent();
             Load();
-
-#if DEBUG
-            this.AttachDevTools(new KeyGesture(Key.F12, KeyModifiers.Alt));
-#endif
-            
         }
 
         public SettingsWindow()

src/Ryujinx/Utilities/AppLibrary/ApplicationData.cs

@@ -37,8 +37,6 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
 
         public string TimePlayedString => ValueFormatUtils.FormatTimeSpan(TimePlayed);
 
-        public bool HasPlayedPreviously => TimePlayedString != string.Empty;
-
         public string LastPlayedString => ValueFormatUtils.FormatDateTime(LastPlayed)?.Replace(" ", "\n");
 
         public string FileSizeString => ValueFormatUtils.FormatFileSize(FileSize);

src/Ryujinx/Utilities/AppLibrary/ApplicationLibrary.cs

@@ -45,7 +45,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
         public const string DefaultLanPlayWebHost = "ryuldnweb.vudjun.com";
         public Language DesiredLanguage { get; set; }
         public event EventHandler<ApplicationCountUpdatedEventArgs> ApplicationCountUpdated;
-        public event Action<LdnGameDataReceivedEventArgs> LdnGameDataReceived;
+        public event EventHandler<LdnGameDataReceivedEventArgs> LdnGameDataReceived;
 
         public readonly IObservableCache<ApplicationData, ulong> Applications;
         public readonly IObservableCache<(TitleUpdateModel TitleUpdate, bool IsSelected), TitleUpdateModel> TitleUpdates;
@@ -779,7 +779,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                     using HttpClient httpClient = new HttpClient();
                     string ldnGameDataArrayString = await httpClient.GetStringAsync($"https://{ldnWebHost}/api/public_games");
                     ldnGameDataArray = JsonHelper.Deserialize(ldnGameDataArrayString, _ldnDataSerializerContext.IEnumerableLdnGameData);
-                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
+                    LdnGameDataReceived?.Invoke(null, new LdnGameDataReceivedEventArgs
                     {
                         LdnData = ldnGameDataArray
                     });
@@ -787,7 +787,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
                 catch (Exception ex)
                 {
                     Logger.Warning?.Print(LogClass.Application, $"Failed to fetch the public games JSON from the API. Player and game count in the game list will be unavailable.\n{ex.Message}");
-                    LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
+                    LdnGameDataReceived?.Invoke(null, new LdnGameDataReceivedEventArgs
                     {
                         LdnData = Array.Empty<LdnGameData>()
                     });
@@ -795,7 +795,7 @@ namespace Ryujinx.Ava.Utilities.AppLibrary
             }
             else
             {
-                LdnGameDataReceived?.Invoke(new LdnGameDataReceivedEventArgs
+                LdnGameDataReceived?.Invoke(null, new LdnGameDataReceivedEventArgs
                 {
                     LdnData = Array.Empty<LdnGameData>()
                 });

src/Ryujinx/Utilities/AppletMetadata.cs

@@ -32,31 +32,29 @@ namespace Ryujinx.Ava.Utilities
 
         public string GetContentPath(ContentManager contentManager)
             => (contentManager ?? _contentManager)
-                ?.GetInstalledContentPath(ProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
+                .GetInstalledContentPath(ProgramId, StorageId.BuiltInSystem, NcaContentType.Program);
 
         public bool CanStart(ContentManager contentManager, out ApplicationData appData,
             out BlitStruct<ApplicationControlProperty> appControl)
         {
             contentManager ??= _contentManager;
             if (contentManager == null)
-                goto BadData;
+            {
-
+                appData = null;
-            string contentPath = GetContentPath(contentManager);
+                appControl = new BlitStruct<ApplicationControlProperty>(0);
-            if (string.IsNullOrEmpty(contentPath)) 
+                return false;
-                goto BadData;
+            }
 
             appData = new() { Name = Name, Id = ProgramId, Path = GetContentPath(contentManager) };
+
+            if (string.IsNullOrEmpty(appData.Path))
+            {
+                appControl = new BlitStruct<ApplicationControlProperty>(0);
+                return false;
+            }
+
             appControl = StructHelpers.CreateCustomNacpData(Name, Version);
             return true;
-            
-        BadData:
-            appData = null;
-            appControl = new BlitStruct<ApplicationControlProperty>(0);
-            return false;
         }
-
-        public bool CanStart(out ApplicationData appData,
-            out BlitStruct<ApplicationControlProperty> appControl)
-            => CanStart(null, out appData, out appControl);
     }
 }

src/Ryujinx/Utilities/Compat/CompatibilityCsv.cs

@@ -1,84 +1,54 @@
 using Gommon;
-using Humanizer;
 using nietras.SeparatedValues;
 using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Common.Logging;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 
 namespace Ryujinx.Ava.Utilities.Compat
 {
-    public struct ColumnIndices(Func<ReadOnlySpan<char>, int> getIndex)
-    {
-        public const string TitleIdCol = "\"title_id\"";
-        public const string GameNameCol = "\"game_name\"";
-        public const string LabelsCol = "\"labels\"";
-        public const string StatusCol = "\"status\"";
-        public const string LastUpdatedCol = "\"last_updated\"";
-        
-        public readonly int TitleId = getIndex(TitleIdCol);
-        public readonly int GameName = getIndex(GameNameCol);
-        public readonly int Labels = getIndex(LabelsCol);
-        public readonly int Status = getIndex(StatusCol);
-        public readonly int LastUpdated = getIndex(LastUpdatedCol);
-    }
-    
     public class CompatibilityCsv
     {
-        static CompatibilityCsv() => Load();
+        public static CompatibilityCsv Shared { get; set; }
         
-        public static void Load()
+        public CompatibilityCsv(SepReader reader)
         {
-            using Stream csvStream = Assembly.GetExecutingAssembly()
+            var entries = new List<CompatibilityEntry>();
-                .GetManifestResourceStream("RyujinxGameCompatibilityList")!;
-            csvStream.Position = 0;
 
-            using SepReader reader = Sep.Reader().From(csvStream);
+            foreach (var row in reader)
-            ColumnIndices columnIndices = new(reader.Header.IndexOf);
-
-            _entries = reader
-                .Enumerate(row => new CompatibilityEntry(ref columnIndices, row))
-                .OrderBy(it => it.GameName)
-                .ToArray();
-            
-            Logger.Debug?.Print(LogClass.UI, "Compatibility CSV loaded.", "LoadCompatibility");
-        }
-
-        public static void Unload()
-        {
-            _entries = null;
-        }
-
-        private static CompatibilityEntry[] _entries;
-        
-        public static CompatibilityEntry[] Entries 
-        {
-            get
             {
-                if (_entries == null)
+                entries.Add(new CompatibilityEntry(reader.Header, row));
-                    Load();
-                
-                return _entries;
             }
+
+            Entries = entries.Where(x => x.Status != null)
+                .OrderBy(it => it.GameName).ToArray();
         }
+
+        public CompatibilityEntry[] Entries { get; }
     }
 
     public class CompatibilityEntry
     {
-        public CompatibilityEntry(ref ColumnIndices indices, SepReader.Row row)
+        public CompatibilityEntry(SepReaderHeader header, SepReader.Row row)
         {
-            string titleIdRow = ColStr(row[indices.TitleId]);
+            if (row.ColCount != header.ColNames.Count)
+                throw new InvalidDataException($"CSV row {row.RowIndex} ({row.ToString()}) has mismatched column count");
+            
+            var titleIdRow = ColStr(row[header.IndexOf("\"extracted_game_id\"")]);
             TitleId = !string.IsNullOrEmpty(titleIdRow) 
                 ? titleIdRow 
                 : default(Optional<string>);
 
-            GameName = ColStr(row[indices.GameName]);
+            var issueTitleRow = ColStr(row[header.IndexOf("\"issue_title\"")]);
+            if (TitleId.HasValue)
+                issueTitleRow = issueTitleRow.ReplaceIgnoreCase($" - {TitleId}", string.Empty);
 
-            Labels = ColStr(row[indices.Labels]).Split(';');
+            GameName = issueTitleRow.Trim().Trim('"');
-            Status = ColStr(row[indices.Status]).ToLower() switch
+
+            IssueLabels = ColStr(row[header.IndexOf("\"issue_labels\"")]).Split(';');
+            Status = ColStr(row[header.IndexOf("\"extracted_status\"")]).ToLower() switch
             {
                 "playable" => LocaleKeys.CompatibilityListPlayable,
                 "ingame" => LocaleKeys.CompatibilityListIngame,
@@ -88,8 +58,8 @@ namespace Ryujinx.Ava.Utilities.Compat
                 _ => null
             };
 
-            if (DateTime.TryParse(ColStr(row[indices.LastUpdated]), out var dt))
+            if (DateTime.TryParse(ColStr(row[header.IndexOf("\"last_event_date\"")]), out var dt))
-                LastUpdated = dt;
+                LastEvent = dt;
 
             return;
             
@@ -98,31 +68,27 @@ namespace Ryujinx.Ava.Utilities.Compat
         
         public string GameName { get; }
         public Optional<string> TitleId { get; }
-        public string[] Labels { get; }
+        public string[] IssueLabels { get; }
         public LocaleKeys? Status { get; }
-        public DateTime LastUpdated { get; }
+        public DateTime LastEvent { get; }
-
-        public string LocalizedLastUpdated =>
-            LocaleManager.FormatDynamicValue(LocaleKeys.CompatibilityListLastUpdated, LastUpdated.Humanize());
 
         public string LocalizedStatus => LocaleManager.Instance[Status!.Value];
         public string FormattedTitleId => TitleId
             .OrElse(new string(' ', 16));
 
-        public string FormattedIssueLabels => Labels
+        public string FormattedIssueLabels => IssueLabels
+            .Where(it => !it.StartsWithIgnoreCase("status"))
             .Select(FormatLabelName)
             .JoinToString(", ");
 
         public override string ToString()
         {
-            StringBuilder sb = new("CompatibilityEntry: {");
+            var sb = new StringBuilder("CompatibilityEntry: {");
             sb.Append($"{nameof(GameName)}=\"{GameName}\", ");
             sb.Append($"{nameof(TitleId)}={TitleId}, ");
-            sb.Append($"{nameof(Labels)}={
+            sb.Append($"{nameof(IssueLabels)}=\"{IssueLabels}\", ");
-                Labels.FormatCollection(it => $"\"{it}\"", separator: ", ", prefix: "[", suffix: "]")
-            }, ");
             sb.Append($"{nameof(Status)}=\"{Status}\", ");
-            sb.Append($"{nameof(LastUpdated)}=\"{LastUpdated}\"");
+            sb.Append($"{nameof(LastEvent)}=\"{LastEvent}\"");
             sb.Append('}');
 
             return sb.ToString();
@@ -178,8 +144,8 @@ namespace Ryujinx.Ava.Utilities.Compat
             if (value == string.Empty)
                 return string.Empty;
         
-            char firstChar = value[0];
+            var firstChar = value[0];
-            string rest = value[1..];
+            var rest = value[1..];
 
             return $"{char.ToUpper(firstChar)}{rest}";
         }

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml

@@ -44,11 +44,8 @@
                          ItemsSource="{Binding CurrentEntries}">
                     <ListBox.ItemTemplate>
                         <DataTemplate DataType="{x:Type local:CompatibilityEntry}">
-                            <Grid Width="750"
+                            <Grid Width="750" ColumnDefinitions="Auto,Auto,Auto,*"
-                                  Margin="5"
+                                  Margin="5">
-                                  ColumnDefinitions="Auto,Auto,Auto,*"
-                                  Background="Transparent"
-                                  ToolTip.Tip="{Binding  LocalizedLastUpdated}">
                                 <TextBlock Grid.Column="0"
                                            Text="{Binding GameName}"
                                            Width="320"

src/Ryujinx/Utilities/Compat/CompatibilityList.axaml.cs

@@ -1,8 +1,11 @@
 using Avalonia.Controls;
 using Avalonia.Styling;
 using FluentAvalonia.UI.Controls;
+using nietras.SeparatedValues;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Helpers;
+using System.IO;
+using System.Reflection;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.Utilities.Compat
@@ -11,6 +14,15 @@ namespace Ryujinx.Ava.Utilities.Compat
     {
         public static async Task Show()
         {
+            if (CompatibilityCsv.Shared is null)
+            {
+                await using Stream csvStream = Assembly.GetExecutingAssembly()
+                    .GetManifestResourceStream("RyujinxGameCompatibilityList")!;
+                csvStream.Position = 0;
+
+                CompatibilityCsv.Shared = new CompatibilityCsv(Sep.Reader().From(csvStream));
+            }
+            
             ContentDialog contentDialog = new()
             {
                 PrimaryButtonText = string.Empty,
@@ -32,8 +44,6 @@ namespace Ryujinx.Ava.Utilities.Compat
             contentDialog.Styles.Add(closeButtonParent);
 
             await ContentDialogHelper.ShowAsync(contentDialog);
-            
-            CompatibilityCsv.Unload();
         }
         
         public CompatibilityList()
@@ -41,7 +51,7 @@ namespace Ryujinx.Ava.Utilities.Compat
             InitializeComponent();
         }
 
-        private void TextBox_OnTextChanged(object sender, TextChangedEventArgs e)
+        private void TextBox_OnTextChanged(object? sender, TextChangedEventArgs e)
         {
             if (DataContext is not CompatibilityViewModel cvm)
                 return;

src/Ryujinx/Utilities/Compat/CompatibilityViewModel.cs

@@ -1,56 +1,49 @@
 using CommunityToolkit.Mvvm.ComponentModel;
+using ExCSS;
 using Gommon;
-using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Ava.Utilities.AppLibrary;
 using System.Collections.Generic;
 using System.Linq;
 
 namespace Ryujinx.Ava.Utilities.Compat
 {
-    public class CompatibilityViewModel : BaseModel
+    public partial class CompatibilityViewModel : ObservableObject
     {
-        private bool _onlyShowOwnedGames = true;
+        [ObservableProperty] private bool _onlyShowOwnedGames = true;
 
-        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityCsv.Entries;
+        private IEnumerable<CompatibilityEntry> _currentEntries = CompatibilityCsv.Shared.Entries;
-        private string[] _ownedGameTitleIds = [];
+        private readonly string[] _ownedGameTitleIds = [];
+        private readonly ApplicationLibrary _appLibrary;
 
         public IEnumerable<CompatibilityEntry> CurrentEntries => OnlyShowOwnedGames
             ? _currentEntries.Where(x =>
-                x.TitleId.Check(tid => _ownedGameTitleIds.ContainsIgnoreCase(tid)))
+                x.TitleId.Check(tid => _ownedGameTitleIds.ContainsIgnoreCase(tid))
+                || _appLibrary.Applications.Items.Any(a => a.Name.EqualsIgnoreCase(x.GameName)))
             : _currentEntries;
 
         public CompatibilityViewModel() {}
 
         public CompatibilityViewModel(ApplicationLibrary appLibrary)
         {
-            appLibrary.ApplicationCountUpdated += (_, _) 
+            _appLibrary = appLibrary;
-                => _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
-            
             _ownedGameTitleIds = appLibrary.Applications.Keys.Select(x => x.ToString("X16")).ToArray();
-        }
 
-        public bool OnlyShowOwnedGames
+            PropertyChanged += (_, args) =>
-        {
-            get => _onlyShowOwnedGames;
-            set
             {
-                OnPropertyChanging();
+                if (args.PropertyName is nameof(OnlyShowOwnedGames))
-                OnPropertyChanging(nameof(CurrentEntries));
+                    OnPropertyChanged(nameof(CurrentEntries));
-                _onlyShowOwnedGames = value;
+            };
-                OnPropertyChanged();
-                OnPropertyChanged(nameof(CurrentEntries));
-            }
         }
 
         public void Search(string searchTerm)
         {
             if (string.IsNullOrEmpty(searchTerm))
             {
-                SetEntries(CompatibilityCsv.Entries);
+                SetEntries(CompatibilityCsv.Shared.Entries);
                 return;
             }
 
-            SetEntries(CompatibilityCsv.Entries.Where(x =>
+            SetEntries(CompatibilityCsv.Shared.Entries.Where(x =>
                 x.GameName.ContainsIgnoreCase(searchTerm)
                 || x.TitleId.Check(tid => tid.ContainsIgnoreCase(searchTerm))));
         }

src/Ryujinx/Utilities/TitleHelper.cs

@@ -4,7 +4,7 @@ namespace Ryujinx.Ava.Utilities
 {
     public static class TitleHelper
     {
-        public static string ActiveApplicationTitle(ProcessResult activeProcess, string applicationVersion, bool customTitlebar, string pauseString = "")
+        public static string ActiveApplicationTitle(ProcessResult activeProcess, string applicationVersion, string pauseString = "")
         {
             if (activeProcess == null)
                 return string.Empty;
@@ -14,9 +14,7 @@ namespace Ryujinx.Ava.Utilities
             string titleIdSection = $" ({activeProcess.ProgramIdText.ToUpper()})";
             string titleArchSection = activeProcess.Is64Bit ? " (64-bit)" : " (32-bit)";
 
-            string appTitle = customTitlebar 
+            string appTitle = $"Ryujinx {applicationVersion} -{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}";
-                ? $"Ryujinx {applicationVersion}\n{titleNameSection.Trim()}\n{titleVersionSection.Trim()}\n{titleIdSection.Trim()}{titleArchSection}"
-                : $"Ryujinx {applicationVersion} -{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}";
 
             return !string.IsNullOrEmpty(pauseString)
                 ? appTitle + $" ({pauseString})"

src/Ryujinx/Utilities/ValueFormatUtils.cs

@@ -1,5 +1,3 @@
-using Humanizer;
-using Humanizer.Localisation;
 using Ryujinx.Ava.Common.Locale;
 using System;
 using System.Globalization;
@@ -33,7 +31,7 @@ namespace Ryujinx.Ava.Utilities
             Gigabytes = 9,
             Terabytes = 10,
             Petabytes = 11,
-            Exabytes = 12
+            Exabytes = 12,
         }
 
         private const double SizeBase10 = 1000;
@@ -50,24 +48,22 @@ namespace Ryujinx.Ava.Utilities
         public static string FormatTimeSpan(TimeSpan? timeSpan)
         {
             if (!timeSpan.HasValue || timeSpan.Value.TotalSeconds < 1)
-                return string.Empty;
+            {
+                // Game was never played
+                return TimeSpan.Zero.ToString("c", CultureInfo.InvariantCulture);
+            }
 
-            if (timeSpan.Value.TotalSeconds < 60)
+            if (timeSpan.Value.TotalDays < 1)
-                return timeSpan.Value.Humanize(1, 
+            {
-                    countEmptyUnits: false, 
+                // Game was played for less than a day
-                    maxUnit: TimeUnit.Second,
+                return timeSpan.Value.ToString("c", CultureInfo.InvariantCulture);
-                    minUnit: TimeUnit.Second);
+            }
 
-            if (timeSpan.Value.TotalMinutes < 60)
+            // Game was played for more than a day
-                return timeSpan.Value.Humanize(1, 
+            TimeSpan onlyTime = timeSpan.Value.Subtract(TimeSpan.FromDays(timeSpan.Value.Days));
-                    countEmptyUnits: false, 
+            string onlyTimeString = onlyTime.ToString("c", CultureInfo.InvariantCulture);
-                    maxUnit: TimeUnit.Minute,
-                    minUnit: TimeUnit.Minute);
 
-            return timeSpan.Value.Humanize(1, 
+            return $"{timeSpan.Value.Days}d, {onlyTimeString}";
-                countEmptyUnits: false, 
-                maxUnit: TimeUnit.Hour, 
-                minUnit: TimeUnit.Hour);
         }
 
         /// <summary>