Embed Hypervisor Framework

add Hypervisor part 2
add Hypervisor
2025-01-20 19:30:52 +11:00 · 2025-01-20 19:19:55 +11:00 · 2025-01-20 19:19:03 +11:00
69 changed files with 2633 additions and 2446 deletions
--- a/.gitea/workflows/add_release_to_site.yml
+++ b/.gitea/workflows/add_release_to_site.yml
@ -1,21 +0,0 @@
-name: Notify API on Release
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  notify-api:
-    runs-on: debian-trixie
-    steps:
-      - name: Send API Call for New Release
-        run: |
-          curl -X POST http://melonx.org/api/new_release \
-               -H "Content-Type: application/json" \
-               -H "Authorization: Bearer ${{ secrets.MELONX_GITEA_API_KEY }}" \
-               -d '{
-                    "version_number": "${{ github.event.release.tag_name }}",
-                    "download_link": "${{ github.event.release.html_url }}",
-                    "changelog": "${{ github.event.release.body }}",
-                    "is_latest": true
-                  }'
--- a/Compile.md
+++ b/Compile.md
@ -1,72 +1,33 @@
-# Compiling MeloNX on macOS
+# How to compile MeloNX using macOS

 ## Prerequisites
+- [.NET 8.0](<https://dotnet.microsoft.com/en-us/download/dotnet/8.0>)
+- A computer with macOS

-Before you begin, ensure you have the following installed:
+## Compiling
+1. Clone the Git Repo and build Ryujinx
+    ```
+       git clone https://github.com/melonx-emu/melonx/tree/XC-ios-ht
+       cd melonx
+       ./compile.sh -x
+    ```

- [**.NET 8.0**](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
- A Mac running **macOS**
+2. Open the Xcode project, stored at MeloNX/src/MeloNX

-## Compilation Steps
+3. Make sure `Ryujinx.SDL2.Headless.dylib` is set to `Embed & Sign` in the General settings for the Xcode project
+  
+4. Signing & Capabilities
+    Change your 'Team' to your Developer Account (free or paid) and change Bundle Identifier to
+    `com.*your name*.MeloNX`

-### 1. Clone the Repository and Build Ryujinx
+6. Build and Run
+    `CMD+R`

-Open a terminal and run:
+7. Check the [post-setup guide](<https://github.com/melonx-emu/melonx/tree/XC-ios-ht/postsetup.md>)

-```sh
-git clone https://git.743378673.xyz/MeloNX/MeloNX.git
-cd MeloNX
-./compile.sh
+## If you don't have a paid developer account
+Make sure these entitlements are removed if you don't have a paid Apple Developer account
 ```
-You may need to run this command if compilation fails, then run the `./compile.sh` command again (You will need to put in your user password. Your password will not be shown at all.)
+    Extended Virtual Addressing
+    Increased Debugging Memory Limit
 ```
-sudo xcode-select --switch /Applications/Xcode.app/Contents/Developer
-```
-
-
-However, if you only need to update MeloNX, make sure you have cd into the directory then run this then skip to step 5 
-```
-git pull
-./compile.sh
-```
-
-### 2. Open the Xcode Project
-
-Navigate to the **Xcode project file** located at:
-
-```
-src/MeloNX/MeloNX.xcodeproj
-```
-
-Double-click to open it in **Xcode**.
-
-### 3. Configure the Project Settings
-
- In **Xcode**, select the **MeloNX** project.
- Under the **General** tab, find `Ryujinx.Headless.SDL2.dylib`.
- Set its **Embed setting** to **"Embed & Sign"**.
-
-### 4. Configure Signing & Capabilities
-
- In **Xcode**, go to **Signing & Capabilities**.
- Set the **Team** to your **Apple Developer account** (free or paid).
- Change the **Bundle Identifier** to:
-
-  ```
-  com.<your-name>.MeloNX
-  ```
-
-  *(Replace `<your-name>` with your actual name or identifier.)*
-
-### 5. Connect Your Device
-
-Ensure your **iPhone/iPad** is **connected** and **recognized** in Xcode.
-
-### 6. Build and Run
-
-Click the **Run (▶️) button** in Xcode to compile and launch MeloNX.
-
---
-
-Now you're all set! 🚀 If you encounter issues, please join the discord at https://melonx.org
-```
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,15 +1,9 @@
-MeloNX License
+MIT License

-Copyright (c) MeloNX Team and Contributors
+Copyright (c) Ryujinx Team and Contributors

-Permission is hereby granted, free of charge, to any person (except anyone who has previously attempted or is currently attempting to merge MeloNX with Pomelo) obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. Every file is under this license, and all copies must be redistributed under the same license.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Anyone who attempts or has attempted to merge MeloNX with Pomelo, or otherwise use this source code in conjunction with Pomelo, is prohibited from using, copying, modifying, or distributing the source code without first obtaining explicit, written permission from Stossy11.
-
-Additionally, the names of the developers or contributors to this project may not be used to endorse or promote products derived from this software without specific, prior written permission from the respective developer(s).
-
-Ryujinx is licensed under the MIT License. Copyright (c) Ryujinx contributors. All rights to Ryujinx are held by its respective copyright holders, and its use is subject to the terms of the MIT License.
--- a/README.md
+++ b/README.md
@ -1,121 +1,22 @@
 <p align="center">
-    <a href="https://melonx.org">
-        <img src="https://melonx.org/static/imgs/MeloNX.svg" alt="MeloNX Logo" width="120">
+    <a href="https://github.com/MeloNX-Emu/MeloNX">
+        <img src="https://github.com/MeloNX-Emu/melonx-emu.github.io/blob/main/favicon.png?raw=true" alt="MeloNX Logo" width="120">
    </a>
 </p>

-<h1 align="center">MeloNX</h1>
-
-
-
 <p align="center">
    MeloNX enables Nintendo Switch game emulation on iOS using the Ryujinx iOS code base.
 </p>

 <p align="center">
       MeloNX is an iOS Nintendo Switch emulator based on Ryujinx, written primarily in C#. Designed to bring accurate performance and a user-friendly interface to iOS, MeloNX makes Switch games accessible on Apple devices.
-       Developed from the ground up, MeloNX is open-source and available on Github under the <a href="https://github.com/MeloNX-Emu/MeloNX/blob/master/LICENSE.txt" target="_blank">MeloNX license (Based on MIT)</a>. <br 
+       Developed from the ground up, MeloNX is open-source and available on Github under the <a href="https://github.com/MeloNX-Emu/MeloNX/blob/master/LICENSE.txt" target="_blank">MIT license</a>. <br 
 </p>

-# Compatibility
+## Compatibility

-MeloNX works on iPhone X and later and iPad 7th Gen and later. Check out the Compatibility on the <a href="https://melonx.org/compatibility/" target="_blank">website</a>.
+MeloNX works on iPhone X and later and iPad 7th Gen and later. A lot of games work.

-# Usage
+## Usage

-## FAQ
- MeloNX is made for iOS 17+, iOS 15 - 16 is supported but will have issues.
- MeloNX needs Xcode or a Paid Apple Developer Account. SideStore support may come soon (SideStore Side Issue)
- MeloNX needs JIT
- Recommended Device: iPhone 15 Pro or newer.
- Low-End Recommended Device**: iPhone 13 Pro. 
- Lowest Supported Device: iPhone XR
-
-
-## How to install
-
-### Paid Developer Account  
-
-1. **Sideload the App**  
-   - Use any sideloading tool that supports Apple IDs.  
-
-2. **Enable Entitlements**  
-   - Visit [Apple Developer Identifiers](https://developer.apple.com/account/resources/identifiers).  
-   - Locate **MeloNX** and enable the following entitlements:  
-     - `Increased Memory Limit`  
-     - `Increased Debugging Memory Limit`  
-
-3. **Reinstall the App**  
-   - Delete the existing installation.  
-   - Sideload the app again with the updated entitlements.  
-
-4. **Enable JIT**  
-   - Use your preferred method to enable Just-In-Time (JIT) compilation.  
-
-5. **Add Necessary Files**  
-
-If having Issues installing firmware (Make sure your Keys are installed first)
-   - If needed, install firmware and keys from **Ryujinx Desktop**.  
-   - Copy the **bis** and **system** folders  
-
-### Xcode
-
-1. **Compile Guide**
-   - Visit the [guide here](https://git.743378673.xyz/MeloNX/MeloNX/src/branch/XC-ios-ht/Compile.md).
-
-2. **Add Necessary Files**  
-
-If having Issues installing firmware (Make sure your Keys are installed first)
-   - If needed, install firmware and keys from **Ryujinx Desktop**.  
-   - Copy the **bis** and **system** folders  
-   
-## Features
-
- **Audio**
-
-  Audio output is entirely supported, audio input (microphone) isn't supported.
-  We use C# wrappers for [OpenAL](https://openal-soft.org/), and [SDL2](https://www.libsdl.org/) & [libsoundio](http://libsound.io/) as fallbacks.
-
- **CPU**
-
-  The CPU emulator, ARMeilleure, emulates an ARMv8 CPU and currently has support for most 64-bit ARMv8 and some of the ARMv7 (and older) instructions, including partial 32-bit support.
-  It translates the ARM code to a custom IR, performs a few optimizations, and turns that into x86 code.
-  There are three memory manager options available depending on the user's preference, leveraging both software-based (slower) and host-mapped modes (much faster).
-  The fastest option (host, unchecked) is set by default.
-  Ryujinx also features an optional Profiled Persistent Translation Cache, which essentially caches translated functions so that they do not need to be translated every time the game loads.
-  The net result is a significant reduction in load times (the amount of time between launching a game and arriving at the title screen) for nearly every game.
-  NOTE: This feature is enabled by default, You must launch the game at least twice to the title screen or beyond before performance improvements are unlocked on the third launch!
-  These improvements are permanent and do not require any extra launches going forward.
-
- **GPU**
-
-  The GPU emulator emulates the Switch's Maxwell GPU using Metal (via MoltenVK) APIs through a custom build of OpenTK or Silk.NET respectively.
-
- **Input**
-
-  We currently have support for keyboard, touch input, JoyCon input support, and nearly all controllers.
-  Motion controls are natively supported in most cases; for dual-JoyCon motion support, DS4Windows or BetterJoy are currently required.
-  In all scenarios, you can set up everything inside the input configuration menu.
-
- **DLC & Modifications**
-
-  MeloNX does not support add-on content/downloadable content.
-  Mods (romfs, exefs, and runtime mods such as cheats) are supported;
-
- **Configuration**
-
-  The emulator has settings for enabling or disabling some logging, remapping controllers, and more.
-
-## License
-
-This software is licensed under the terms of the [MeloNX license (Based on MIT License)](LICENSE.txt).
-This project makes use of code authored by the libvpx project, licensed under BSD and the ffmpeg project, licensed under LGPLv3.
-See [LICENSE.txt](LICENSE.txt) and [THIRDPARTY.md](distribution/legal/THIRDPARTY.md) for more details.
-
-## Credits
-
- [Ryujinx](https://github.com/ryujinx-mirror/ryujinx) is used for the base of this emulator. (link is to ryujinx-mirror since they were supportive)
- [LibHac](https://github.com/Thealexbarney/LibHac) is used for our file-system.
- [AmiiboAPI](https://www.amiiboapi.com) is used in our Amiibo emulation.
- [ldn_mitm](https://github.com/spacemeowx2/ldn_mitm) is used for one of our available multiplayer modes.
- [ShellLink](https://github.com/securifybv/ShellLink) is used for Windows shortcut generation.
+To run MeloNX on your iOS device, at least 4GB of RAM is recommended to ensure stability. For full instructions, refer to our [Setup Guide](https://github.com/MeloNX-Emu/MeloNX/wiki/Setup-Guide).
--- a/src/ARMeilleure/Translation/Cache/JitCache.cs
+++ b/src/ARMeilleure/Translation/Cache/JitCache.cs
@ -15,11 +15,11 @@ namespace ARMeilleure.Translation.Cache
    static partial class JitCache
    {
        private static readonly int _pageSize = (int)MemoryBlock.GetPageSize();
-        private static readonly int _pageMask = _pageSize - 4;
+        private static readonly int _pageMask = _pageSize - 8;

        private const int CodeAlignment = 4; // Bytes.
-	    private const int CacheSize = 1024 * 1024 * 1024;
-        private const int CacheSizeIOS = 128 * 1024 * 1024;
+        private const int CacheSize = 128 * 1024 * 1024;
+        private const int CacheSizeIOS = 64 * 1024 * 1024;

        private static ReservedRegion _jitRegion;
        private static JitCacheInvalidation _jitCacheInvalidator;
--- a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj
+++ b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj
@ -25,8 +25,11 @@

 /* Begin PBXBuildFile section */
 		4E0DED342D05695D00FEF007 /* SwiftUIJoystick in Frameworks */ = {isa = PBXBuildFile; productRef = 4E0DED332D05695D00FEF007 /* SwiftUIJoystick */; };
+		4E4854022D138D7600A446A6 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E80AA622CD7122800029585 /* GameController.framework */; };
 		4EA5AE822D16807500AD0B9F /* SwiftSVG in Frameworks */ = {isa = PBXBuildFile; productRef = 4EA5AE812D16807500AD0B9F /* SwiftSVG */; };
-		CA8F9C322D3F5AB200D7E586 /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E80AA622CD7122800029585 /* GameController.framework */; };
+		4EA894EB2D3E3DC700FABB01 /* Ryujinx.Headless.SDL2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BD43C6282D1B2514003BBC42 /* Ryujinx.Headless.SDL2.dylib */; };
+		4EA894EC2D3E3DC700FABB01 /* Ryujinx.Headless.SDL2.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = BD43C6282D1B2514003BBC42 /* Ryujinx.Headless.SDL2.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+		5650564B2D2A758600C8BB1E /* dotnet.xcconfig.example in Resources */ = {isa = PBXBuildFile; fileRef = 5650564A2D2A758600C8BB1E /* dotnet.xcconfig.example */; };
 /* End PBXBuildFile section */

 /* Begin PBXContainerItemProxy section */
@ -54,22 +57,13 @@
 /* End PBXContainerItemProxy section */

 /* Begin PBXCopyFilesBuildPhase section */
-		4E50F49E2D5CC28B0080F1D1 /* Embed Watch Content */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "$(CONTENTS_FOLDER_PATH)/Watch";
-			dstSubfolderSpec = 16;
-			files = (
-			);
-			name = "Embed Watch Content";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		4E80AA092CD6FAA800029585 /* Embed Libraries */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
+				4EA894EC2D3E3DC700FABB01 /* Ryujinx.Headless.SDL2.dylib in Embed Libraries */,
 			);
 			name = "Embed Libraries";
 			runOnlyForDeploymentPostprocessing = 0;
@ -77,7 +71,6 @@
 /* End PBXCopyFilesBuildPhase section */

 /* Begin PBXFileReference section */
-		4E7023A52D5A98E2002C7183 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		4E80A98D2CD6F54500029585 /* MeloNX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MeloNX.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		4E80A99D2CD6F54700029585 /* MeloNXTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MeloNXTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		4E80A9A72CD6F54700029585 /* MeloNXUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = MeloNXUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
@ -87,9 +80,10 @@
 /* End PBXFileReference section */

 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		CA8F9C2D2D3F5A3A00D7E586 /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+		565056492D2A756A00C8BB1E /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
+				"Dependencies/Dynamic Libraries/Ryujinx.Headless.SDL2.dylib",
 				Info.plist,
 			);
 			target = 4E80A98C2CD6F54500029585 /* MeloNX */;
@ -97,17 +91,14 @@
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */

 /* Begin PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet section */
-		CA0AE31D2D3EECBC00F6D350 /* PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet */ = {
+		5650564D2D2A75B300C8BB1E /* PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet;
 			attributesByRelativePath = {
 				"Dependencies/Dynamic Libraries/Hypervisor.framework" = (
 					CodeSignOnCopy,
 					RemoveHeadersOnCopy,
 				);
-				"Dependencies/Dynamic Libraries/Ryujinx.Headless.SDL2.dylib" = (
-					CodeSignOnCopy,
-				);
-				"Dependencies/Dynamic Libraries/RyujinxKeyboard.framework" = (
+				"Dependencies/Dynamic Libraries/SoftwareKeyboard.framework" = (
 					CodeSignOnCopy,
 					RemoveHeadersOnCopy,
 				);
@ -167,8 +158,7 @@
 				"Dependencies/Dynamic Libraries/libavcodec.dylib",
 				"Dependencies/Dynamic Libraries/libavutil.dylib",
 				"Dependencies/Dynamic Libraries/libMoltenVK.dylib",
-				"Dependencies/Dynamic Libraries/Ryujinx.Headless.SDL2.dylib",
-				"Dependencies/Dynamic Libraries/RyujinxKeyboard.framework",
+				"Dependencies/Dynamic Libraries/SoftwareKeyboard.framework",
 				Dependencies/XCFrameworks/libavcodec.xcframework,
 				Dependencies/XCFrameworks/libavfilter.xcframework,
 				Dependencies/XCFrameworks/libavformat.xcframework,
@ -184,7 +174,7 @@
 /* End PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet section */

 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		4E80A98F2CD6F54500029585 /* MeloNX */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (CA8F9C2D2D3F5A3A00D7E586 /* PBXFileSystemSynchronizedBuildFileExceptionSet */, CA0AE31D2D3EECBC00F6D350 /* PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = MeloNX; sourceTree = "<group>"; };
+		4E80A98F2CD6F54500029585 /* MeloNX */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (565056492D2A756A00C8BB1E /* PBXFileSystemSynchronizedBuildFileExceptionSet */, 5650564D2D2A75B300C8BB1E /* PBXFileSystemSynchronizedGroupBuildPhaseMembershipExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = MeloNX; sourceTree = "<group>"; };
 		4E80A9A02CD6F54700029585 /* MeloNXTests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = MeloNXTests; sourceTree = "<group>"; };
 		4E80A9AA2CD6F54700029585 /* MeloNXUITests */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = MeloNXUITests; sourceTree = "<group>"; };
 /* End PBXFileSystemSynchronizedRootGroup section */
@ -194,9 +184,10 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				4E4854022D138D7600A446A6 /* GameController.framework in Frameworks */,
 				4E0DED342D05695D00FEF007 /* SwiftUIJoystick in Frameworks */,
-				CA8F9C322D3F5AB200D7E586 /* GameController.framework in Frameworks */,
 				4EA5AE822D16807500AD0B9F /* SwiftSVG in Frameworks */,
+				4EA894EB2D3E3DC700FABB01 /* Ryujinx.Headless.SDL2.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -243,7 +234,6 @@
 		4E80AA192CD700F500029585 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				4E7023A52D5A98E2002C7183 /* UIKit.framework */,
 				4E80AA622CD7122800029585 /* GameController.framework */,
 			);
 			name = Frameworks;
@ -279,7 +269,6 @@
 				4E80A98A2CD6F54500029585 /* Frameworks */,
 				4E80A98B2CD6F54500029585 /* Resources */,
 				4E80AA092CD6FAA800029585 /* Embed Libraries */,
-				4E50F49E2D5CC28B0080F1D1 /* Embed Watch Content */,
 			);
 			buildRules = (
 			);
@ -350,7 +339,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
-				LastSwiftUpdateCheck = 1620;
+				LastSwiftUpdateCheck = 1610;
 				LastUpgradeCheck = 1610;
 				TargetAttributes = {
 					4E80A98C2CD6F54500029585 = {
@ -404,6 +393,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				5650564B2D2A758600C8BB1E /* dotnet.xcconfig.example in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -645,17 +635,6 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 				);
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GENERATE_INFOPLIST_FILE = YES;
@ -663,12 +642,11 @@
 				INFOPLIST_KEY_GCSupportsGameMode = YES;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
 				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
-				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "MeloNX needs access to your Photo Library in order to save images";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UIRequiresFullScreen = YES;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportsDocumentBrowser = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@ -690,6 +668,7 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
@ -700,6 +679,154 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/XCFrameworks",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Core/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Core/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Core/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
@ -711,7 +838,7 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 0.0.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@ -744,17 +871,6 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
-					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 				);
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GENERATE_INFOPLIST_FILE = YES;
@ -762,12 +878,11 @@
 				INFOPLIST_KEY_GCSupportsGameMode = YES;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.games";
 				INFOPLIST_KEY_LSSupportsOpeningDocumentsInPlace = YES;
-				INFOPLIST_KEY_NSPhotoLibraryAddUsageDescription = "MeloNX needs access to your Photo Library in order to save images";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UIRequiresFullScreen = YES;
-				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
+				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportsDocumentBrowser = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = (
@ -789,6 +904,7 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
@ -799,6 +915,154 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/XCFrameworks",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Core/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Core/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Core/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
@ -810,7 +1074,7 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 				);
-				MARKETING_VERSION = 1.1.0;
+				MARKETING_VERSION = 0.0.8;
 				PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
--- a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@ -1,5 +1,5 @@
 {
-  "originHash" : "d611b071fbe94fdc9900a07a218340eab4ce2c3c7168bf6542f2830c0400a72b",
+  "originHash" : "1b46f7a56d6f994a826e31441c25b929398800cf38b3e9be23ae6e0ef8fc32c7",
  "pins" : [
    {
      "identity" : "swiftsvg",
--- a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/benlawrence.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/benlawrence.xcuserdatad/UserInterfaceState.xcuserstate
--- a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/brandon.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/brandon.xcuserdatad/UserInterfaceState.xcuserstate
--- a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate
+++ b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate
--- a/src/MeloNX/MeloNX.xcodeproj/xcuserdata/benlawrence.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/src/MeloNX/MeloNX.xcodeproj/xcuserdata/benlawrence.xcuserdatad/xcschemes/xcschememanagement.plist
@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>MeloNX.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-		<key>Ryujinx.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>1</integer>
-		</dict>
-		<key>com.Stossy11.MeloNX.RyujinxAg.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>2</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>
--- a/src/MeloNX/MeloNX.xcodeproj/xcuserdata/brandon.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/src/MeloNX/MeloNX.xcodeproj/xcuserdata/brandon.xcuserdatad/xcschemes/xcschememanagement.plist
@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>MeloNX.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-		<key>Ryujinx.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>1</integer>
-		</dict>
-		<key>com.Stossy11.MeloNX.RyujinxAg.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>2</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>
--- a/src/MeloNX/MeloNX.xcodeproj/xcuserdata/stossy11.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/src/MeloNX/MeloNX.xcodeproj/xcuserdata/stossy11.xcuserdatad/xcschemes/xcschememanagement.plist
@ -12,12 +12,12 @@
 		<key>Ryujinx.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>3</integer>
+			<integer>1</integer>
 		</dict>
 		<key>com.Stossy11.MeloNX.RyujinxAg.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>2</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
--- a/src/MeloNX/MeloNX/App/Core/Headers/Ryujinx-Header.h
+++ b/src/MeloNX/MeloNX/App/Core/Headers/Ryujinx-Header.h
@ -5,17 +5,11 @@
 //  Created by Stossy11 on 3/11/2024.
 //

-#define DRM 0
-#define CS_DEBUGGED 0x10000000
-
 #ifndef RyujinxHeader
 #define RyujinxHeader


-#include <SDL2/SDL.h>
-#include <SDL2/SDL_syswm.h>
-#import "utils.h"
-
+#import "SDL2/SDL.h"

 #ifdef __cplusplus
 extern "C" {
@ -24,10 +18,10 @@ extern "C" {
 struct GameInfo {
    long FileSize;
    char TitleName[512];
-    char TitleId[32];
+    long TitleId;
    char Developer[256];
-    char Version[16];
-    unsigned char* ImageData;
+    int Version;
+    unsigned char* ImageData; 
    unsigned int ImageSize;
 };

@ -45,6 +39,8 @@ int get_current_fps();

 void initialize();

+const char* get_game_controllers();
+
 #ifdef __cplusplus
 }
 #endif
--- a/src/MeloNX/MeloNX/App/Core/JIT/IsJITEnabled.swift
+++ b/src/MeloNX/MeloNX/App/Core/JIT/IsJITEnabled.swift
@ -1,19 +0,0 @@
-//
-//  IsJITEnabled.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 10/02/2025.
-//
-
-
-
-func isJITEnabled() -> Bool {
-    var flags: Int = 0
-    
-    csops(getpid(), 0, &flags, sizeof(flags))
-    return (Int32(flags) & CS_DEBUGGED) != 0;
-}
-
-func sizeof<T>(_ value: T) -> Int {
-    return MemoryLayout<T>.size
-}
--- a/src/MeloNX/MeloNX/App/Core/JIT/JitStreamerEB/EnableJIT.swift
+++ b/src/MeloNX/MeloNX/App/Core/JIT/JitStreamerEB/EnableJIT.swift
@ -1,78 +0,0 @@
-//
-//  EnableJIT.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 10/02/2025.
-//
-
-import Foundation
-
-func enableJITEB()  {
-    guard let bundleID = Bundle.main.bundleIdentifier else {
-        return
-    }
-    let address = URL(string: "http://[fd00::]:9172/launch_app/\(bundleID)")!
-    
-    let task = URLSession.shared.dataTask(with: address) { data, response, error in
-        if error != nil {
-            return
-        }
-        
-        
-        guard let httpResponse = response as? HTTPURLResponse else {
-            return
-        }
-        DispatchQueue.main.async {
-            showLaunchAppAlert(jsonData: data!, in: UIApplication.shared.windows.last!.rootViewController!)
-        }
-        
-        return
-    }
-    
-    task.resume()
-}
-
-struct LaunchApp: Codable {
-    let ok: Bool
-    let error: String?
-    let launching: Bool
-    let position: Int?
-    let mounting: Bool
-}
-
-func showLaunchAppAlert(jsonData: Data, in viewController: UIViewController) {
-    do {
-        let result = try JSONDecoder().decode(LaunchApp.self, from: jsonData)
-        
-        var message = ""
-        
-        if let error = result.error {
-            message = "Error: \(error)"
-        } else if result.mounting {
-            message = "App is mounting..."
-        } else if result.launching {
-            message = "App is launching..."
-        } else {
-            message = "App launch status unknown."
-        }
-        
-        if let position = result.position {
-            message += "\nPosition: \(position)"
-        }
-        
-        let alert = UIAlertController(title: "Launch Status", message: message, preferredStyle: .alert)
-        alert.addAction(UIAlertAction(title: "OK", style: .default))
-        
-        DispatchQueue.main.async {
-            viewController.present(alert, animated: true)
-        }
-        
-    } catch {
-        let alert = UIAlertController(title: "Decoding Error", message: error.localizedDescription, preferredStyle: .alert)
-        alert.addAction(UIAlertAction(title: "OK", style: .default))
-        
-        DispatchQueue.main.async {
-            viewController.present(alert, animated: true)
-        }
-    }
-}
--- a/src/MeloNX/MeloNX/App/Core/JIT/utils.m
+++ b/src/MeloNX/MeloNX/App/Core/JIT/utils.m
@ -60,6 +60,15 @@ void ShowAlert(NSString* title, NSString* message, _Bool* showok)

 __attribute__((constructor)) static void entry(int argc, char **argv)
 {
+    if (isJITEnabled()) {
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        [defaults setBool:YES forKey:@"JIT"];
+        [defaults synchronize]; // Ensure the value is saved immediately
+    } else {
+        NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+        [defaults setBool:NO forKey:@"JIT"];
+        [defaults synchronize]; // Ensure the value is saved immediately
+    }
    
    if (getEntitlementValue(@"com.apple.developer.kernel.increased-memory-limit")) {
        NSLog(@"Entitlement Does Exist");
--- a/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/VirtualController.swift
+++ b/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/VirtualController.swift
@ -20,10 +20,12 @@ class VirtualController {
    }
    
    private func setupVirtualController() {
+        // Initialize SDL if not already initialized
        if SDL_WasInit(Uint32(SDL_INIT_GAMECONTROLLER)) == 0 {
            SDL_InitSubSystem(Uint32(SDL_INIT_GAMECONTROLLER))
        }
        
+        // Create virtual controller
        var joystickDesc = SDL_VirtualJoystickDesc(
            version: UInt16(SDL_VIRTUAL_JOYSTICK_DESC_VERSION),
            type: Uint16(SDL_JOYSTICK_TYPE_GAMECONTROLLER.rawValue),
--- a/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/WaitforVC.swift
+++ b/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/WaitforVC.swift
@ -0,0 +1,80 @@
+//
+//  VirtualController.swift
+//  MeloNX
+//
+//  Created by Stossy11 on 28/11/2024.
+//
+
+import Foundation
+import GameController
+import UIKit
+import SwiftUI
+
+func waitforcontroller() {
+    if let window = theWindow {
+        // Function to recursively search for GCControllerView
+        func findGCControllerView(in view: UIView) -> UIView? {
+            // Check if current view is GCControllerView
+            if String(describing: type(of: view)) == "ControllerView" {
+                return view
+            }
+            
+            // Search through subviews
+            for subview in view.subviews {
+                if let found = findGCControllerView(in: subview) {
+                    return found
+                }
+            }
+            
+            return nil
+        }
+        
+        let controllerView = ControllerView()
+        let controllerHostingController = UIHostingController(rootView: controllerView)
+        let containerView = TransparentHostingContainerView(frame: window.bounds)
+        containerView.backgroundColor = .clear
+
+        controllerHostingController.view.frame = containerView.bounds
+        controllerHostingController.view.backgroundColor = .clear
+        containerView.addSubview(controllerHostingController.view)
+        
+        class LandscapeViewController: UIViewController {
+            override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
+                return .landscape
+            }
+
+            override var preferredInterfaceOrientationForPresentation: UIInterfaceOrientation {
+                return .landscapeLeft
+            }
+        }
+
+        let landscapeVC = LandscapeViewController()
+        landscapeVC.modalPresentationStyle = .fullScreen
+        window.rootViewController?.present(landscapeVC, animated: false, completion: nil)
+
+        Timer.scheduledTimer(withTimeInterval: 0.1, repeats: true) { timer in
+            if findGCControllerView(in: window) == nil {
+                window.addSubview(containerView)
+                
+                window.bringSubviewToFront(containerView)
+                
+                timer.invalidate()
+            } else {
+                timer.invalidate()
+            }
+        }
+
+    }
+}
+
+
+class TransparentHostingContainerView: UIView {
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        // Check if the point is within the subviews of this container
+        let view = super.hitTest(point, with: event)
+        print(view)
+        
+        // Return nil if the touch is outside visible content (passes through to views below)
+        return view === self ? nil : view
+    }
+}
--- a/src/MeloNX/MeloNX/App/Core/Ryujinx/Display/DisplayVisible.swift
+++ b/src/MeloNX/MeloNX/App/Core/Ryujinx/Display/DisplayVisible.swift
@ -8,92 +8,31 @@
 import Foundation
 import GameController
 import UIKit
-import SwiftUI



 var theWindow: UIWindow? = nil
 extension UIWindow {
-    // Makes the SDLWindow use the current WindowScene instead of making its own window.
-    // Also waits for the window to append the on-screen controller
    @objc func wdb_makeKeyAndVisible() {
-        let enabled =  UserDefaults.standard.bool(forKey: "oldWindowCode")
-        
-        if #unavailable(iOS 17.0), enabled {
+        if #available(iOS 13.0, *) {
            self.windowScene = (UIApplication.shared.connectedScenes.first! as! UIWindowScene)
        }
-        
        self.wdb_makeKeyAndVisible()
        theWindow = self
        
-        if #available(iOS 17, *) {
-            Ryujinx.shared.repeatuntilfindLayer()
-        } else if UserDefaults.standard.bool(forKey: "isVirtualController") && enabled {
-            waitForController()
-        }
-    }
-}
-
-// MARK: - iOS 16 and below Only
-
-var hostingController: UIHostingController<ControllerView>?
-func waitForController() {
-    guard let window = theWindow else { return }
-
-    // Function to search for an existing UIHostingController with ControllerView
-    func findGCControllerView(in view: UIView) -> UIHostingController<ControllerView>? {
-        if let hostingVC = view.next as? UIHostingController<ControllerView> {
-            return hostingVC
-        }
        
-        for subview in view.subviews {
-            if let found = findGCControllerView(in: subview) {
-                return found
+        if UserDefaults.standard.bool(forKey: "isVirtualController") {
+            if let window = theWindow {
+        
+
+                
+                waitforcontroller()
            }
        }
-        
-        return nil
-    }
-    
-    let controllerView = ControllerView()
-    let newHostingController = UIHostingController(rootView: controllerView)
-    
-    hostingController = newHostingController
-    
-    let containerView = newHostingController.view!
-    containerView.backgroundColor = .clear
-    containerView.frame = window.bounds
-    containerView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-
-    // Timer for controller
-    Timer.scheduledTimer(withTimeInterval: 0.1, repeats: true) { timer in
-        if findGCControllerView(in: window) == nil {
-            // Adds Virtual Controller Subview
-            window.addSubview(containerView)
-            window.bringSubviewToFront(containerView)
-
-            if let sdlWindow = SDL_GetWindowFromID(1) {
-                SDL_SetWindowPosition(sdlWindow, 0, 0)
-            }
-
-            timer.invalidate()
-        }
    }
 }


-class TransparentHostingContainerView: UIView {
-    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
-        // Check if the point is within the subviews of this container
-        let view = super.hitTest(point, with: event)
-        print(view)
-        
-        // Return nil if the touch is outside visible content (passes through to views below)
-        return view === self ? nil : view
-    }
-}
-
-// Patches makeKeyAndVisible to wdb_makeKeyAndVisible
 func patchMakeKeyAndVisible() {
    let uiwindowClass = UIWindow.self
    if let m1 = class_getInstanceMethod(uiwindowClass, #selector(UIWindow.makeKeyAndVisible)),
--- a/src/MeloNX/MeloNX/App/Core/Ryujinx/Display/UIView/Screenshot.swift
+++ b/src/MeloNX/MeloNX/App/Core/Ryujinx/Display/UIView/Screenshot.swift
@ -1,18 +0,0 @@
-//
-//  Screenshot.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 09/02/2025.
-//
-
-import UIKit
-
-extension UIView {
-    func screenshot() -> UIImage? {
-        UIGraphicsBeginImageContextWithOptions(self.bounds.size, false, 0)
-        defer { UIGraphicsEndImageContext() }
-        
-        self.drawHierarchy(in: self.bounds, afterScreenUpdates: true)
-        return UIGraphicsGetImageFromCurrentImageContext()
-    }
-}
--- a/src/MeloNX/MeloNX/App/Core/Ryujinx/Ryujinx.swift
+++ b/src/MeloNX/MeloNX/App/Core/Ryujinx/Ryujinx.swift
@ -28,47 +28,17 @@ struct iOSNav<Content: View>: View {
    }
 }

-public enum AspectRatio: String, Codable, CaseIterable {
-    case fixed4x3 = "Fixed4x3"
-    case fixed16x9 = "Fixed16x9"
-    case fixed16x10 = "Fixed16x10"
-    case fixed21x9 = "Fixed21x9"
-    case fixed32x9 = "Fixed32x9"
-    case stretched = "Stretched"
-
-    var displayName: String {
-        switch self {
-        case .fixed4x3: return "4:3"
-        case .fixed16x9: return "16:9 (Default)"
-        case .fixed16x10: return "16:10"
-        case .fixed21x9: return "21:9"
-        case .fixed32x9: return "32:9"
-        case .stretched: return "Stretched (Full Screen)"
-        }
-    }
-}
-
-
 class Ryujinx {
    private var isRunning = false
    
    let virtualController = VirtualController()
    
    @Published var controllerMap: [Controller] = []
-    @Published var metalLayer: CAMetalLayer? = nil
-    @Published var firmwareversion = "0"
-    @Published var emulationUIView = UIView()
-    @Published var games: [Game] = []
-    
-    var shouldMetal: Bool {
-        metalLayer == nil
-    }
+    @State var firmwareversion = "0"
    
    static let shared = Ryujinx()
    
-    private init() {
-        self.games = loadGames()
-    }
+    private init() {}
    
    public struct Configuration : Codable, Equatable {
        var gamepath: String
@ -79,20 +49,13 @@ class Ryujinx {
        var nintendoinput: Bool
        var enableInternet: Bool
        var listinputids: Bool
-        var aspectRatio: AspectRatio
+        var fullscreen: Bool
        var memoryManagerMode: String
        var disableShaderCache: Bool
        var hypervisor: Bool
        var disableDockedMode: Bool
        var enableTextureRecompression: Bool
        var additionalArgs: [String]
-        var maxAnisotropy: Float
-        var macroHLE: Bool
-        var ignoreMissingServices: Bool
-        var expandRam: Bool
-        var dfsIntegrityChecks: Bool
-        var disablePTC: Bool
-        var disablevsync: Bool
        

        init(gamepath: String,
@ -100,8 +63,8 @@ class Ryujinx {
             debuglogs: Bool = false,
             tracelogs: Bool = false,
             listinputids: Bool = false,
-             aspectRatio: AspectRatio = .fixed16x9,
-             memoryManagerMode: String = "HostMappedUnsafe",
+             fullscreen: Bool = true,
+             memoryManagerMode: String = "HostMapped",
             disableShaderCache: Bool = false,
             disableDockedMode: Bool = false,
             nintendoinput: Bool = true,
@ -109,21 +72,14 @@ class Ryujinx {
             enableTextureRecompression: Bool = true,
             additionalArgs: [String] = [],
             resscale: Float = 1.00,
-             maxAnisotropy: Float = 0,
-             macroHLE: Bool = false,
-             ignoreMissingServices: Bool = false,
-             hypervisor: Bool = false,
-             expandRam: Bool = false,
-             dfsIntegrityChecks: Bool = false,
-             disablePTC: Bool = false,
-             disablevsync: Bool = false
+             hypervisor: Bool = false
        ) {
            self.gamepath = gamepath
            self.inputids = inputids
            self.debuglogs = debuglogs
            self.tracelogs = tracelogs
            self.listinputids = listinputids
-            self.aspectRatio = aspectRatio
+            self.fullscreen = fullscreen
            self.disableShaderCache = disableShaderCache
            self.disableDockedMode = disableDockedMode
            self.enableTextureRecompression = enableTextureRecompression
@ -132,14 +88,7 @@ class Ryujinx {
            self.resscale = resscale
            self.nintendoinput = nintendoinput
            self.enableInternet = enableInternet
-            self.maxAnisotropy = maxAnisotropy
-            self.macroHLE = macroHLE
-            self.expandRam = expandRam
-            self.ignoreMissingServices = ignoreMissingServices
            self.hypervisor = hypervisor
-            self.dfsIntegrityChecks = dfsIntegrityChecks
-            self.disablePTC = disablePTC
-            self.disablevsync = disablevsync
        }
    }

@ -152,12 +101,11 @@ class Ryujinx {
        isRunning = true
        
        RunLoop.current.perform {
-            
-            let url = URL(string: config.gamepath)
+            let url = URL(string: config.gamepath)!
            
            do {
                let args = self.buildCommandLineArgs(from: config)
-                let accessing = url?.startAccessingSecurityScopedResource()
+                let accessing = url.startAccessingSecurityScopedResource()
                
                // Convert Arguments to ones that Ryujinx can Read
                let cArgs = args.map { strdup($0) }
@ -169,8 +117,8 @@ class Ryujinx {
                
                if result != 0 {
                    self.isRunning = false
-                    if let accessing, accessing {
-                        url!.stopAccessingSecurityScopedResource()
+                    if accessing {
+                        url.stopAccessingSecurityScopedResource()
                    }
                    
                    throw RyujinxError.executionError(code: result)
@ -194,54 +142,6 @@ class Ryujinx {
    var running: Bool {
        return isRunning
    }
-    
-    
-    func loadGames() -> [Game] {
-        let fileManager = FileManager.default
-        guard let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first else { return [] }
-        
-        let romsDirectory = documentsDirectory.appendingPathComponent("roms")
-        
-        if (!fileManager.fileExists(atPath: romsDirectory.path)) {
-            do {
-                try fileManager.createDirectory(at: romsDirectory, withIntermediateDirectories: true, attributes: nil)
-            } catch {
-                print("Failed to create roms directory: \(error)")
-            }
-        }
-        var games: [Game] = []
-        
-        do {
-            let files = try fileManager.contentsOfDirectory(at: romsDirectory, includingPropertiesForKeys: nil)
-            
-            for fileURLCandidate in files {
-                if fileURLCandidate.pathExtension == "zip" {
-                    continue
-                }
-                
-                do {
-                    let handle = try FileHandle(forReadingFrom: fileURLCandidate)
-                    let fileExtension = (fileURLCandidate.pathExtension as NSString).utf8String
-                    let extensionPtr = UnsafeMutablePointer<CChar>(mutating: fileExtension)
-                    
-                    
-                    let gameInfo = get_game_info(handle.fileDescriptor, extensionPtr)
-                    
-                    let game = Game.convertGameInfoToGame(gameInfo: gameInfo, url: fileURLCandidate)
-                    
-                    games.append(game)
-                } catch {
-                    print(error)
-                }
-            }
-            
-            return games
-        } catch {
-            print("Error loading games from roms folder: \(error)")
-            return games
-        }
-        
-    }

    private func buildCommandLineArgs(from config: Configuration) -> [String] {
        var args: [String] = []
@ -261,50 +161,27 @@ class Ryujinx {
        // We don't need this. Ryujinx should handle it fine :3
        // this also causes crashes in some games :3
        
-        args.append(contentsOf: ["--aspect-ratio", config.aspectRatio.rawValue])
+        if config.fullscreen {
+            args.append(contentsOf: ["--aspect-ratio", "Stretched"])
+        }
+        
        
        if config.nintendoinput {
            args.append("--correct-controller")
        }
        
-        if config.disablePTC {
-            args.append("--disable-ptc")
-        }
-        
-        if config.disablevsync {
-            args.append("--disable-vsync")
-        }
        
+        // args.append("--disable-vsync")
        
        if config.hypervisor {
            args.append("--use-hypervisor")
        }
        
-        if config.dfsIntegrityChecks {
-            args.append("--disable-fs-integrity-checks")
-        }
-        
        
        if config.resscale != 1.0 {
            args.append(contentsOf: ["--resolution-scale", String(config.resscale)])
        }
        
-        if config.expandRam {
-            args.append(contentsOf: ["--expand-ram", String(config.expandRam)])
-        }
-        
-        if config.ignoreMissingServices {
-            args.append(contentsOf: ["--ignore-missing-services", String(config.maxAnisotropy)])
-        }
-        
-        if config.maxAnisotropy != 0 {
-            args.append(contentsOf: ["--max-anisotropy", String(config.maxAnisotropy)])
-        }
-        
-        if !config.macroHLE {
-            args.append("--disable-macro-hle")
-        }
-        
        if !config.disableShaderCache { // same with disableShaderCache
            args.append("--disable-shader-cache")
        }
@ -373,58 +250,35 @@ class Ryujinx {
        }
    }
    
-    private func generateGamepadId(joystickIndex: Int32) -> String? {
-        let guid = SDL_JoystickGetDeviceGUID(joystickIndex)
-
-        if guid.data.0 == 0 && guid.data.1 == 0 && guid.data.2 == 0 && guid.data.3 == 0 {
-            return nil
-        }
-
-        let reorderedGUID: [UInt8] = [
-            guid.data.3, guid.data.2, guid.data.1, guid.data.0,
-            guid.data.5, guid.data.4,
-            guid.data.7, guid.data.6,
-            guid.data.8, guid.data.9,
-            guid.data.10, guid.data.11, guid.data.12, guid.data.13, guid.data.14, guid.data.15
-        ]
-
-        let guidString = reorderedGUID.map { String(format: "%02X", $0) }.joined().lowercased()
-
-        func substring(_ str: String, _ start: Int, _ end: Int) -> String {
-            let startIdx = str.index(str.startIndex, offsetBy: start)
-            let endIdx = str.index(str.startIndex, offsetBy: end)
-            return String(str[startIdx..<endIdx])
-        }
-
-        let formattedGUID = "\(substring(guidString, 0, 8))-\(substring(guidString, 8, 12))-\(substring(guidString, 12, 16))-\(substring(guidString, 16, 20))-\(substring(guidString, 20, 32))"
-
-        return "\(joystickIndex)-\(formattedGUID)"
-    }
-    
    func getConnectedControllers() -> [Controller] {
+        
+
+        guard let jsonPtr = get_game_controllers() else {
+            return []
+        }
+        
+        // Convert the unmanaged memory (C string) to a Swift String
+        let jsonString = String(cString: jsonPtr)
+        
        var controllers: [Controller] = []
-
-        let numJoysticks = SDL_NumJoysticks()
-
-        for i in 0..<numJoysticks {
-            if let controller = SDL_GameControllerOpen(i) {
-                let guid = generateGamepadId(joystickIndex: i)
-                let name = String(cString: SDL_GameControllerName(controller))
-                
-                print("Controller \(i): \(name), GUID: \(guid ?? "")")
-                
-                guard let guid else {
-                    SDL_GameControllerClose(controller)
-                    return []
+        
+        // Splitting the string by newline
+        let lines = jsonString.components(separatedBy: "\n")
+        
+        // Parsing each line
+        for line in lines {
+            if line.contains(":") {
+                let parts = line.components(separatedBy: ":")
+                if parts.count == 2 {
+                    let id = parts[0].trimmingCharacters(in: .whitespacesAndNewlines)
+                    let name = parts[1].trimmingCharacters(in: .whitespacesAndNewlines)
+                    controllers.append(Controller(id: id, name: name))
                }
-                
-                controllers.append(Controller(id: guid, name: name))
-
-                SDL_GameControllerClose(controller)
            }
-         }
+        }
        
        return controllers
+        
    }
    
    func removeFirmware() {
@ -458,63 +312,6 @@ class Ryujinx {
            print("Error removing folder: \(error)")
        }
    }
-    
-    
-    func repeatuntilfindLayer() {
-        DispatchQueue.global(qos: .background).async {
-            while self.metalLayer == nil {
-                let layer = self.getMetalLayer(nil)
-
-                if layer != nil {
-                    DispatchQueue.main.async {
-                        self.metalLayer = layer
-                    }
-                    break
-                }
-
-                Thread.sleep(forTimeInterval: 0.1)
-            }
-        }
-    }
-
-    
-    func getMetalLayer(_ window: OpaquePointer?) -> CAMetalLayer? {
-        var window = window
-        if window == nil {
-            window = SDL_GetWindowFromID(1)
-        }
-
-        var windowInfo = SDL_SysWMinfo()
-        SDL_GetWindowWMInfo(window, &windowInfo)
-
-        
-        guard let uiWindow = windowInfo.info.uikit.window,
-              let rootView = uiWindow.takeUnretainedValue().rootViewController?.view else {
-            print("Unable to get root view")
-            return nil
-        }
-
-        func findMetalLayer(in view: UIView) -> CAMetalLayer? {
-            if let metalLayer = view.layer as? CAMetalLayer {
-                return metalLayer
-            }
-            
-            for subview in view.subviews {
-                if let metalLayer = findMetalLayer(in: subview) {
-                    return metalLayer
-                }
-            }
-            
-            return nil
-        }
-
-        if let existingLayer = findMetalLayer(in: rootView) {
-            print("Found Metal Layer")
-            return existingLayer
-        }
-        print("found nothing")
-        return nil
-    }



@ -524,3 +321,4 @@ class Ryujinx {
 }


+
--- a/src/MeloNX/MeloNX/App/Intents/LaunchGameIntent.swift
+++ b/src/MeloNX/MeloNX/App/Intents/LaunchGameIntent.swift
@ -1,86 +0,0 @@
-//
-//  LaunchGameIntentDef.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 10/02/2025.
-//
-
-
-import Foundation
-import SwiftUI
-import Intents
-import AppIntents
-
-@available(iOS 16.0, *)
-struct LaunchGameIntentDef: AppIntent {
-    
-    static let title: LocalizedStringResource = "Launch Game"
-    
-    static var description = IntentDescription("Launches the Selected Game.")
-
-    @Parameter(title: "Game", optionsProvider: GameOptionsProvider())
-    var gameName: String
-
-    static var parameterSummary: some ParameterSummary {
-        Summary("Launch \(\.$gameName)")
-    }
-    
-    static var openAppWhenRun: Bool = true
-
-    @MainActor
-    func perform() async throws -> some IntentResult {
-        
-        let ryujinx = Ryujinx.shared.games
-        
-        let name = findClosestGameName(input: gameName, games: ryujinx.flatMap(\.titleName))
-        
-        let urlString = "melonx://game?name=\(name ?? gameName)"
-        print(urlString)
-        if let url = URL(string: urlString) {
-            UIApplication.shared.open(url, options: [:], completionHandler: nil)
-        }
-        
-        return .result()
-    }
-    
-    func levenshteinDistance(_ a: String, _ b: String) -> Int {
-        let aCount = a.count
-        let bCount = b.count
-        var matrix = [[Int]](repeating: [Int](repeating: 0, count: bCount + 1), count: aCount + 1)
-        
-        for i in 0...aCount {
-            matrix[i][0] = i
-        }
-        
-        for j in 0...bCount {
-            matrix[0][j] = j
-        }
-        
-        for i in 1...aCount {
-            for j in 1...bCount {
-                let cost = a[a.index(a.startIndex, offsetBy: i - 1)] == b[b.index(b.startIndex, offsetBy: j - 1)] ? 0 : 1
-                matrix[i][j] = min(matrix[i - 1][j] + 1, matrix[i][j - 1] + 1, matrix[i - 1][j - 1] + cost)
-            }
-        }
-        
-        return matrix[aCount][bCount]
-    }
-
-    func findClosestGameName(input: String, games: [String]) -> String? {
-        let closestGame = games.min { a, b in
-            let distanceA = levenshteinDistance(input, a)
-            let distanceB = levenshteinDistance(input, b)
-            return distanceA < distanceB
-        }
-        return closestGame
-    }
-}
-
-@available(iOS 16.0, *)
-struct GameOptionsProvider: DynamicOptionsProvider {
-    func results() async throws -> [String] {
-        let dynamicGames = Ryujinx.shared.loadGames()
-        
-        return dynamicGames.map { $0.titleName }
-    }
-}
--- a/src/MeloNX/MeloNX/App/Models/Game.swift
+++ b/src/MeloNX/MeloNX/App/Models/Game.swift
@ -1,84 +0,0 @@
-//
-//  GameInfo.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 9/12/2024.
-//
-
-import SwiftUI
-import UniformTypeIdentifiers
-
-public struct Game: Identifiable, Equatable, Hashable {
-    public var id = UUID()
-
-    var containerFolder: URL
-    var fileType: UTType
-    var fileURL: URL
-
-    var titleName: String
-    var titleId: String
-    var developer: String
-    var version: String
-    var icon: UIImage?
-    
-    
-    static func convertGameInfoToGame(gameInfo: GameInfo, url: URL) -> Game {
-        var gameInfo = gameInfo
-        var gameTemp = Game(containerFolder: url.deletingLastPathComponent(), fileType: .item, fileURL: url, titleName: "", titleId: "", developer: "", version: "")
-        
-        gameTemp.titleName = withUnsafePointer(to: &gameInfo.TitleName) {
-            $0.withMemoryRebound(to: UInt8.self, capacity: MemoryLayout.size(ofValue: $0)) {
-                String(cString: $0)
-            }
-        }
-        
-        gameTemp.developer = withUnsafePointer(to: &gameInfo.Developer) {
-            $0.withMemoryRebound(to: UInt8.self, capacity: MemoryLayout.size(ofValue: $0)) {
-                String(cString: $0)
-            }
-        }
-        
-        gameTemp.titleId = withUnsafePointer(to: &gameInfo.TitleId) {
-            $0.withMemoryRebound(to: UInt8.self, capacity: MemoryLayout.size(ofValue: $0)) {
-                String(cString: $0)
-            }
-        }
-        
-        
-        gameTemp.version = withUnsafePointer(to: &gameInfo.Version) {
-            $0.withMemoryRebound(to: UInt8.self, capacity: MemoryLayout.size(ofValue: $0)) {
-                String(cString: $0)
-            }
-        }
-        
-        let imageSize = Int(gameInfo.ImageSize)
-        if imageSize > 0, imageSize <= 1024 * 1024 {
-            let imageData = Data(bytes: gameInfo.ImageData, count: imageSize)
-            
-            gameTemp.icon = UIImage(data: imageData)
-        } else {
-            print("Invalid image size.")
-        }
-        return gameTemp
-    }
-    
-    func createImage(from gameInfo: GameInfo) -> UIImage? {
-        // Access the struct
-        let gameInfoValue = gameInfo
-
-        // Get the image data
-        let imageSize = Int(gameInfoValue.ImageSize)
-        guard imageSize > 0, imageSize <= 1024 * 1024 else {
-            print("Invalid image size.")
-            return nil
-        }
-
-        // Convert the ImageData byte array to Swift's Data
-        let imageData = Data(bytes: gameInfoValue.ImageData, count: imageSize)
-
-        // Create a UIImage (or NSImage on macOS)
-        print(imageData)
-        
-        return UIImage(data: imageData)
-    }
-}
--- a/src/MeloNX/MeloNX/App/Views/ContentView.swift
+++ b/src/MeloNX/MeloNX/App/Views/ContentView.swift
@ -12,6 +12,7 @@ import Darwin
 import UIKit
 import MetalKit
 // import SDL
+import SoftwareKeyboard

 struct MoltenVKSettings: Codable, Hashable {
    let string: String
@ -19,32 +20,22 @@ struct MoltenVKSettings: Codable, Hashable {
 }

 struct ContentView: View {
-    // Games
+    // MARK: - Properties
+    @State private var theWindow: UIWindow?
    @State private var game: Game?
-    
-    // Controllers
    @State private var controllersList: [Controller] = []
    @State private var currentControllers: [Controller] = []
-    @State var onscreencontroller: Controller = Controller(id: "", name: "")
-    @State private var isVirtualControllerActive: Bool = false
-    @AppStorage("isVirtualController") var isVCA: Bool = true
-    
-    // Settings and Configuration
    @State private var config: Ryujinx.Configuration
    @State var settings: [MoltenVKSettings]
    @AppStorage("useTrollStore") var useTrollStore: Bool = false
-    
-    // JIT
-    @AppStorage("jitStreamerEB") var jitStreamerEB: Bool = false
-    
-    // Other Configuration
+    @State private var isVirtualControllerActive: Bool = false
+    @AppStorage("isVirtualController") var isVCA: Bool = true
+    @State var onscreencontroller: Controller = Controller(id: "", name: "")
+    @AppStorage("JIT") var isJITEnabled: Bool = false
    @State var isMK8: Bool = false
    @AppStorage("quit") var quit: Bool = false
-    @State var quits: Bool = false
-    @AppStorage("MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS") var mVKPreFillBuffer: Bool = true
-    @AppStorage("MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS") var syncqsubmits: Bool = false
    
-    // Loading Animation
+    @State var quits: Bool = false
    @State private var clumpOffset: CGFloat = -100
    private let clumpWidth: CGFloat = 100
    private let animationDuration: Double = 1.0
@ -59,21 +50,14 @@ struct ContentView: View {
        let defaultSettings: [MoltenVKSettings] = [
            // MoltenVKSettings(string: "MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS", value: "1"),
            // MoltenVKSettings(string: "MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS", value: "2"),
-            // Metal Private API isn't needed and causes more stutters
-            MoltenVKSettings(string: "MVK_USE_METAL_PRIVATE_API", value: "1"),
-            MoltenVKSettings(string: "MVK_CONFIG_USE_METAL_PRIVATE_API", value: "1"),
-            MoltenVKSettings(string: "MVK_DEBUG", value: "0"),
-            MoltenVKSettings(string: "MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS", value: "0"),
-            // MoltenVKSettings(string: "MVK_CONFIG_LOG_LEVEL", value: "0"),
-            // MVK_CONFIG_LOG_LEVEL
-            //MVK_DEBUG
-            // Uses more ram but makes performance higher, may add an option in settings to change or enable / disable this value (default 64 or 192 depending on what i decide)
-            MoltenVKSettings(string: "MVK_CONFIG_MAX_ACTIVE_METAL_COMMAND_BUFFERS_PER_QUEUE", value: "1024"),
+            MoltenVKSettings(string: "MVK_USE_METAL_PRIVATE_API", value: "0"),
+            // MoltenVKSettings(string: "MVK_CONFIG_RESUME_LOST_DEVICE", value: "1"),
+            MoltenVKSettings(string: "MVK_CONFIG_USE_METAL_PRIVATE_API", value: "0")
        ]
        
        _settings = State(initialValue: defaultSettings)
        
-        print("JIT Enabled: \(isJITEnabled())")
+        print("JIT Enabled: \(isJITEnabled)")
        
        initializeSDL()
    }
@ -82,91 +66,34 @@ struct ContentView: View {
    var body: some View {
        if game != nil, quits == false {
            if isLoading {
-                if Air.shared.connected {
-                    Text("")
-                        .onAppear() {
-                            Air.play(AnyView(emulationView))
-                        }
-                } else {
-                    ZStack {
-                        emulationView
-                            .onAppear() {
-                                // This is fro the old exiting game feature that didn't work properly. will look into it and figure out a better alternative
-                                /*
-                                 Timer.scheduledTimer(withTimeInterval: 0.1, repeats: true) { timer in
-                                 timer.invalidate()
-                                 quits = quit
-                                 
-                                 if quits {
-                                 quit = false
-                                 timer.invalidate()
-                                 }
-                                 }
-                                 */
+                emulationView
+                    .onAppear() {
+                        Timer.scheduledTimer(withTimeInterval: 0.1, repeats: true) { timer in
+                            timer.invalidate()
+                            quits = quit
+                            
+                            if quits {
+                                quit = false
+                                timer.invalidate()
                            }
-                    }
-                }
-            } else {
-                // This is when the game starts to stop the animation
-                if #available(iOS 16, *) {
-                    EmulationView()
-                        .persistentSystemOverlays(.hidden)
-                        .onAppear() {
-                            isAnimating = false
                        }
-                } else {
-                    VStack {
-                        
                    }
+            } else {
+                VStack {
                    
                }
+                .onAppear() {
+                    isAnimating = false  
+                }
            }
        } else {
-            // This is the main menu view that includes the Settings and the Game Selector
            mainMenuView
                .onAppear() {
                    quits = false
-
-                    initControllerObservers() // This initializes the Controller Observers that refreshes the controller list when a new controller connecvts.
-                }
-                .onOpenURL() { url in
-                    if let components = URLComponents(url: url, resolvingAgainstBaseURL: true),
-                       components.host == "game" {
-                        if let text = components.queryItems?.first(where: { $0.name == "id" })?.value {
-
-                            game = Ryujinx.shared.games.first(where: { $0.titleId == text })
-                        } else if let text = components.queryItems?.first(where: { $0.name == "name" })?.value {
-                            game = Ryujinx.shared.games.first(where: { $0.titleName == text })
-                        }
-                    }
                }
        }
        
    }
-    
-    
-    private func initControllerObservers() {
-        NotificationCenter.default.addObserver(
-            forName: .GCControllerDidConnect,
-            object: nil,
-            queue: .main) { notification in
-                if let controller = notification.object as? GCController {
-                    print("Controller connected: \(controller.productCategory)")
-                    refreshControllersList()
-                }
-        }
-        
-        
-        NotificationCenter.default.addObserver(
-            forName: .GCControllerDidDisconnect,
-            object: nil,
-            queue: .main) { notification in
-                if let controller = notification.object as? GCController {
-                    print("Controller disconnected: \(controller.productCategory)")
-                    refreshControllersList()
-                }
-        }
-    }
        
    // MARK: - View Components
    private var emulationView: some View {
@ -222,10 +149,7 @@ struct ContentView: View {
                                
                                Timer.scheduledTimer(withTimeInterval: 0.5, repeats: true) { timer in
                                    if get_current_fps() != 0 {
-                                        withAnimation {
-                                            isLoading = false
-                                        }
-                                        
+                                        isLoading = false
                                        isAnimating = false
                                        timer.invalidate()
                                    }
@ -250,52 +174,48 @@ struct ContentView: View {
    private var mainMenuView: some View {
        MainTabView(startemu: $game, config: $config, MVKconfig: $settings, controllersList: $controllersList, currentControllers: $currentControllers, onscreencontroller: $onscreencontroller)
            .onAppear() {
-                Timer.scheduledTimer(withTimeInterval: 1, repeats: false) { timer in
-                    refreshControllersList()
-                }
-                
-                Air.play(AnyView(
-                    VStack {
-                        Image(systemName: "gamecontroller")
-                            .font(.system(size: 300))
-                            .foregroundColor(.gray)
-                            .padding(.bottom, 10)
+                refreshControllersList()
+                    
                        
-                        Text("Select Game")
-                            .font(.system(size: 150))
-                            .bold()
-                    }
-                ))
-                
-                let isJIT = isJITEnabled()
-                
-                if !isJIT, useTrollStore {
-                    askForJIT()
-                }
-                
-                if !isJIT, jitStreamerEB {
-                    enableJITEB()
-                }
-                
+                        let isJIT = UserDefaults.standard.bool(forKey: "JIT-ENABLED")
+                        
+                        if !isJIT, useTrollStore {
+                            askForJIT()
+                        }
+                    
            }
    }
    
    // MARK: - Helper Methods
-    var SdlInitFlags: uint = SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_VIDEO; // Initialises SDL2 for Events, Game Controller, Joystick, Audio and Video.
+    var SdlInitFlags: uint = SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_VIDEO;
    private func initializeSDL() {
        setMoltenVKSettings()
-        SDL_SetMainReady() // Sets SDL Ready
-        SDL_iPhoneSetEventPump(SDL_TRUE) // Set iOS Event Pump to true (Check out SDL2 Documentation here)
-        SDL_Init(SdlInitFlags) // Initialises SDL2
+        SDL_SetMainReady()
+        SDL_iPhoneSetEventPump(SDL_TRUE)
+        SDL_Init(SdlInitFlags)
        initialize()
    }
    
    private func setupEmulation() {
        patchMakeKeyAndVisible()
-        isVCA = (currentControllers.first(where: { $0 == onscreencontroller }) != nil)
        
-        DispatchQueue.main.async {
-            start(displayid: 1)
+        if (currentControllers.first(where: { $0 == onscreencontroller }) != nil) {
+            
+            isVCA = true
+            
+            DispatchQueue.main.async {
+                start(displayid: 1)
+            }
+            
+            
+        } else {
+            isVCA = false
+            
+            DispatchQueue.main.async {
+                start(displayid: 1)
+            }
+            
+            
        }
    }
    
@ -308,21 +228,13 @@ struct ContentView: View {
        
        controllersList.removeAll(where: { $0.id == "0"})
        
-        currentControllers = []
-        
-        if controllersList.count == 1 {
-            let controller = controllersList[0]
+        if controllersList.count > 2 {
+            let controller =  controllersList[2]
+            currentControllers.append(controller)
+        } else if let controller = controllersList.first(where: { $0.id == onscreencontroller.id }), !controllersList.isEmpty {
            currentControllers.append(controller)
-        } else if (controllersList.count - 1) >= 1 {
-            for controller in controllersList {
-                if controller.id != onscreencontroller.id && !currentControllers.contains(where: { $0.id == controller.id }) {
-                    currentControllers.append(controller)
-                }
-            }
        }
    }
-    
-    

    func showAlert(title: String, message: String, showOk: Bool, completion: @escaping (Bool) -> Void) {
        DispatchQueue.main.async {
@ -351,15 +263,11 @@ struct ContentView: View {
        config.gamepath = game.fileURL.path
        config.inputids = Array(Set(currentControllers.map(\.id)))
        
-        if mVKPreFillBuffer {
-            let setting = MoltenVKSettings(string: "MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS", value: "2")
+        if game.titleName.lowercased() == "super mario odyssey" {
+            let setting = MoltenVKSettings(string: "MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS", value: "1")
            setenv(setting.string, setting.value, 1)
        }
        
-        if syncqsubmits {
-            let setting = MoltenVKSettings(string: "MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS", value: "2")
-            setenv(setting.string, setting.value, 1)
-        }
        
        if config.inputids.isEmpty {
            config.inputids.append("0")
@ -374,8 +282,9 @@ struct ContentView: View {
    
    

-    // Sets MoltenVK Environment Variables
+    
    private func setMoltenVKSettings() {
+        
        settings.forEach { setting in
            setenv(setting.string, setting.value, 1)
        }
--- a/src/MeloNX/MeloNX/App/Views/ControllerView/ControllerView.swift
+++ b/src/MeloNX/MeloNX/App/Views/ControllerView/ControllerView.swift
@ -45,7 +45,7 @@ struct ControllerView: View {
                                    DPadView()
                                }
                            }
-                            Spacer()
+                            .padding()
                            VStack {
                                ShoulderButtonsViewRight()
                                ZStack {
@ -53,6 +53,7 @@ struct ControllerView: View {
                                    ABXYView()
                                }
                            }
+                            .padding()
                        }
                        
                        HStack {
@ -62,8 +63,8 @@ struct ControllerView: View {
                                .padding(.horizontal, 40)
                        }
                    }
+                    .padding(.bottom, geometry.size.height / 3.2) // very broken
                }
-                
            } else {
                // could be landscape
                VStack {
@ -99,12 +100,12 @@ struct ControllerView: View {
                                // Spacer()
                                VStack {
                                    // Spacer()
-                                    ButtonView(button: .back) // Adding the - button
+                                    ButtonView(button: .back) // Adding the + button
                                }
                                Spacer()
                                VStack {
                                    // Spacer()
-                                    ButtonView(button: .start) // Adding the + button
+                                    ButtonView(button: .start) // Adding the - button
                                }
                                // Spacer()
                            }
--- a/src/MeloNX/MeloNX/App/Views/Emulation/AirPlay/Air.swift
+++ b/src/MeloNX/MeloNX/App/Views/Emulation/AirPlay/Air.swift
@ -1,143 +0,0 @@
-// Credit https://github.com/heestand-xyz/AirKit
-
-import UIKit
-import SwiftUI
-
-public class Air {
-    
-    static let shared = Air()
-    
-    public var connected: Bool = false {
-        didSet {
-            connectionCallbacks.forEach({ $0(connected) })
-        }
-    }
-    var connectionCallbacks: [(Bool) -> ()] = []
-    
-    var airScreen: UIScreen?
-    var airWindow: UIWindow?
-    
-    var hostingController: UIHostingController<AnyView>?
-    
-    var appIsActive: Bool { UIApplication.shared.applicationState == .active }
-    
-    init() {
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(didConnect),
-                                               name: UIScreen.didConnectNotification, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(didDisconnect),
-                                               name: UIScreen.didDisconnectNotification, object: nil)
-        
-        NotificationCenter.default.addObserver(self, selector: #selector(didBecomeActive),
-                                               name: UIApplication.didBecomeActiveNotification, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(willResignActive),
-                                               name: UIApplication.willResignActiveNotification, object: nil)
-    }
-    
-    private func check() {
-       if let connectedScreen = UIScreen.screens.first(where: { $0 != .main }) {
-            add(screen: connectedScreen) { success in
-                guard success else { return }
-                self.connected = true
-            }
-        }
-    }
-    
-    public static func play(_ view: AnyView) {
-        Air.shared.hostingController = UIHostingController<AnyView>(rootView: view)
-        Air.shared.check()
-    }
-    
-    public static func stop() {
-        Air.shared.remove()
-        Air.shared.hostingController = nil
-    }
-    
-    public static func connection(_ callback: @escaping (Bool) -> ()) {
-        Air.shared.connectionCallbacks.append(callback)
-    }
-    
-    @objc func didConnect(sender: NSNotification) {
-        print("AirKit - Connect")
-        self.connected = true
-        guard let screen: UIScreen = sender.object as? UIScreen else { return }
-        add(screen: screen) { success in
-            guard success else { return }
-            self.connected = true
-        }
-    }
-    
-    func add(screen: UIScreen, completion: @escaping (Bool) -> ()) {
-        
-        print("AirKit - Add Screen")
-        
-        airScreen = screen
-        
-        airWindow = UIWindow(frame: airScreen!.bounds)
-        
-        guard let viewController: UIViewController = hostingController else {
-            print("AirKit - Add - Failed: Hosting Controller Not Found")
-            completion(false)
-            return
-        }
-        
-        findWindowScene(for: airScreen!) { windowScene in
-            guard let airWindowScene: UIWindowScene = windowScene else {
-                print("AirKit - Add - Failed: Window Scene Not Found")
-                completion(false)
-                return
-            }
-            self.airWindow?.rootViewController = viewController
-            self.airWindow?.windowScene = airWindowScene
-            self.airWindow?.isHidden = false
-            print("AirKit - Add Screen - Done")
-            completion(true)
-        }
-        
-    }
-    
-    func findWindowScene(for screen: UIScreen, shouldRecurse: Bool = true, completion: @escaping (UIWindowScene?) -> ())  {
-        print("AirKit - Find Window Scene")
-        var matchingWindowScene: UIWindowScene? = nil
-        let scenes = UIApplication.shared.connectedScenes
-        for scene in scenes {
-            if let windowScene = scene as? UIWindowScene {
-                if windowScene.screen == screen {
-                    matchingWindowScene = windowScene
-                    break
-                }
-            }
-        }
-        guard let windowScene: UIWindowScene = matchingWindowScene else {
-            DispatchQueue.main.async {
-                self.findWindowScene(for: screen, shouldRecurse: false) { windowScene in
-                    completion(windowScene)
-                }
-            }
-            return
-        }
-        completion(windowScene)
-    }
-    
-    @objc func didDisconnect() {
-        print("AirKit - Disconnect")
-        remove()
-        connected = false
-    }
-    
-    func remove() {
-        print("AirKit - Remove")
-        airWindow = nil
-        airScreen = nil
-    }
-    
-    @objc func didBecomeActive() {
-        print("AirKit - App Active")
-    }
-    
-    @objc func willResignActive() {
-        print("AirKit - App Inactive")
-        
-    }
-    
-}
--- a/src/MeloNX/MeloNX/App/Views/Emulation/AirPlay/AirPlay.swift
+++ b/src/MeloNX/MeloNX/App/Views/Emulation/AirPlay/AirPlay.swift
@ -1,13 +0,0 @@
-import UIKit
-import SwiftUI
-
-public extension View {
-    
-    func airPlay() -> some View {
-        print("AirKit - airPlay")
-        Air.play(AnyView(self))
-        return self
-    }
-    
-}
-
--- a/src/MeloNX/MeloNX/App/Views/Emulation/EmulationView/EmulationView.swift
+++ b/src/MeloNX/MeloNX/App/Views/Emulation/EmulationView/EmulationView.swift
@ -1,67 +0,0 @@
-//
-//  EmulationView.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 09/02/2025.
-//
-
-import SwiftUI
-
-// Emulation View
-struct EmulationView: View {
-    @AppStorage("isVirtualController") var isVCA: Bool = true
-    @AppStorage("showScreenShotButton") var ssb: Bool = false
-    @State var isAirplaying = Air.shared.connected
-    var body: some View {
-        ZStack {
-            if isAirplaying {
-                Text("")
-                    .onAppear {
-                        Air.play(AnyView(MetalView(airplay: true).ignoresSafeArea()))
-                    }
-            } else {
-                MetalView(airplay: false) // The Emulation View
-                    .ignoresSafeArea()
-                    .edgesIgnoringSafeArea(.all)
-            }
-            
-            // Above Emulation View
-            
-            if isVCA {
-                ControllerView() // Virtual Controller
-            }
-            
-            if ssb {
-                Group {
-                    VStack {
-                        Spacer()
-                        
-                        HStack {
-                            
-                            Button {
-                                if let screenshot = Ryujinx.shared.emulationUIView.screenshot() {
-                                    UIImageWriteToSavedPhotosAlbum(screenshot, nil, nil, nil)
-                                }
-                            } label: {
-                                Image(systemName: "square.and.arrow.up")
-                            }
-                            .frame(width: UIDevice.current.systemName.contains("iPadOS") ? 60 * 1.2 : 45, height: UIDevice.current.systemName.contains("iPadOS") ? 60 * 1.2 : 45)
-                            .padding()
-                            
-                            Spacer()
-                        }
-                        
-                    }
-                }
-            }
-        }
-        .onAppear {
-            Air.shared.connectionCallbacks.append { cool in
-                DispatchQueue.main.async {
-                    isAirplaying = cool
-                    print(cool)
-                }
-            }
-        }
-    }
-}
--- a/src/MeloNX/MeloNX/App/Views/Emulation/MetalView/MetalView.swift
+++ b/src/MeloNX/MeloNX/App/Views/Emulation/MetalView/MetalView.swift
@ -1,39 +0,0 @@
-//
-//  MetalView.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 09/02/2025.
-//
-
-import SwiftUI
-import MetalKit
-
-struct MetalView: UIViewRepresentable {
-    
-    var airplay: Bool // just in case :3
-    
-    func makeUIView(context: Context) -> UIView {
-        let metalLayer = Ryujinx.shared.metalLayer!
-        
-        var view = UIView()
-        
-        metalLayer.frame = view.bounds
-        if airplay {
-            metalLayer.contentsScale = view.contentScaleFactor
-        } else {
-            Ryujinx.shared.emulationUIView.contentScaleFactor = metalLayer.contentsScale // Right size and Fix Touch :3
-        }
-        
-        Ryujinx.shared.emulationUIView = view
-        
-        if !Ryujinx.shared.emulationUIView.subviews.contains(where: { $0 == metalLayer }) {
-            Ryujinx.shared.emulationUIView.layer.addSublayer(metalLayer)
-        }
-        
-        return Ryujinx.shared.emulationUIView
-    }
-    
-    func updateUIView(_ uiView: UIView, context: Context) {
-        // nothin
-    }
-}
--- a/src/MeloNX/MeloNX/App/Views/GamesList/GameInfoSheet.swift
+++ b/src/MeloNX/MeloNX/App/Views/GamesList/GameInfoSheet.swift
@ -1,112 +0,0 @@
-//
-//  GameInfoSheet.swift
-//  MeloNX
-//
-//  Created by Bella on 08/02/2025.
-//
-
-import SwiftUI
-
-struct GameInfoSheet: View {
-    let game: Game
-    
-    @Environment(\.dismiss) var dismiss
-    
-    var body: some View {
-        iOSNav {
-            VStack {
-                if let icon = game.icon {
-                    Image(uiImage: icon)
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .frame(width: 250, height: 250)
-                        .cornerRadius(10)
-                        .padding()
-                        .contextMenu {
-                            Button {
-                                UIImageWriteToSavedPhotosAlbum(icon, nil, nil, nil)
-                            } label: {
-                                Label("Save to Photos", systemImage: "square.and.arrow.down")
-                            }
-                        }
-                } else {
-                    Image(systemName: "questionmark.circle")
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .frame(width: 150, height: 150)
-                        .padding()
-                }
-                
-                VStack(alignment: .leading) {
-                    VStack(alignment: .leading) {
-                        Text("**\(game.titleName)** | \(game.titleId.capitalized)")
-                        Text(game.developer)
-                            .font(.caption)
-                            .foregroundStyle(.secondary)
-                    }
-                    .padding(.vertical, 3)
-                    
-                    VStack(alignment: .leading, spacing: 5) {
-                        Text("Information")
-                            .font(.title2)
-                            .bold()
-                        
-                        Text("**Version:** \(game.version)")
-                        Text("**Title ID:** \(game.titleId)")
-                            .contextMenu {
-                                Button {
-                                    UIPasteboard.general.string = game.titleId
-                                } label: {
-                                    Text("Copy Title ID")
-                                }
-                            }
-                        Text("**Game Size:** \(fetchFileSize(for: game.fileURL) ?? 0) bytes")
-                        Text("**File Type:** .\(getFileType(game.fileURL))")
-                        Text("**Game URL:** \(trimGameURL(game.fileURL))")
-                    }
-                }
-
-                Spacer()
-            }
-            .padding(.horizontal, 5)
-            .navigationTitle(game.titleName)
-            .navigationBarTitleDisplayMode(.inline)
-            .toolbar {
-                ToolbarItem(placement: .navigationBarTrailing) {
-                    Button("Done") {
-                        dismiss()
-                    }
-                }
-            }
-        }
-    }
-    
-    func fetchFileSize(for gamePath: URL) -> UInt64? {
-        let fileManager = FileManager.default
-        do {
-            let attributes = try fileManager.attributesOfItem(atPath: gamePath.path)
-            if let size = attributes[FileAttributeKey.size] as? UInt64 {
-                return size
-            }
-        } catch {
-            print("Error getting file size: \(error)")
-        }
-        return nil
-    }
-
-    func trimGameURL(_ url: URL) -> String {
-        let path = url.path
-        if let range = path.range(of: "/roms/") {
-            return String(path[range.lowerBound...])
-        }
-        return path
-    }
-    
-    func getFileType(_ url: URL) -> String {
-        let path = url.path
-        if let range = path.range(of: ".") {
-            return String(path[range.upperBound...])
-        }
-        return "Unknown"
-    }
-}
--- a/src/MeloNX/MeloNX/App/Views/GamesList/GameListView.swift
+++ b/src/MeloNX/MeloNX/App/Views/GamesList/GameListView.swift
@ -8,17 +8,12 @@
 import SwiftUI
 import UniformTypeIdentifiers

-extension UTType {
-    static let nsp = UTType(exportedAs: "com.nintendo.switch-package")
-    static let xci = UTType(exportedAs: "com.nintendo.switch-cartridge")
-}

 struct GameLibraryView: View {
    @Binding var startemu: Game?
-    // @State var importDLCs = false
+    @State private var games: [Game] = []
    @State private var searchText = ""
    @State private var isSearching = false
-    @State private var showRMFWAlert = false
    @AppStorage("recentGames") private var recentGamesData: Data = Data()
    @State private var recentGames: [Game] = []
    @Environment(\.colorScheme) var colorScheme
@ -26,21 +21,13 @@ struct GameLibraryView: View {
    @State var firmwareversion = "0"
    @State var isImporting: Bool = false
    @State var startgame = false
-    @State var isSelectingGameFile = false
-    @State var isViewingGameInfo: Bool = false
-    @State var gameInfo: Game?
-    var games: Binding<[Game]> {
-        Binding(
-            get: { Ryujinx.shared.games },
-            set: { Ryujinx.shared.games = $0 }
-        )
-    }
+    
    
    var filteredGames: [Game] {
        if searchText.isEmpty {
-            return Ryujinx.shared.games
+            return games
        }
-        return Ryujinx.shared.games.filter {
+        return games.filter {
            $0.titleName.localizedCaseInsensitiveContains(searchText) ||
            $0.developer.localizedCaseInsensitiveContains(searchText)
        }
@ -57,7 +44,7 @@ struct GameLibraryView: View {
                            .padding(.top, 12)
                    }
                    
-                    if Ryujinx.shared.games.isEmpty {
+                    if games.isEmpty {
                        VStack(spacing: 16) {
                            Image(systemName: "gamecontroller.fill")
                                .font(.system(size: 64))
@ -100,7 +87,7 @@ struct GameLibraryView: View {
                                
                                LazyVStack(spacing: 2) {
                                    ForEach(filteredGames) { game in
-                                        GameListRow(game: game, startemu: $startemu, games: games, isViewingGameInfo: $isViewingGameInfo, gameInfo: $gameInfo)
+                                        GameListRow(game: game, startemu: $startemu)
                                            .onTapGesture {
                                                addToRecentGames(game)
                                            }
@ -110,7 +97,7 @@ struct GameLibraryView: View {
                        } else {
                            LazyVStack(spacing: 2) {
                                ForEach(filteredGames) { game in
-                                    GameListRow(game: game, startemu: $startemu, games: games, isViewingGameInfo: $isViewingGameInfo, gameInfo: $gameInfo)
+                                    GameListRow(game: game, startemu: $startemu)
                                        .onTapGesture {
                                            addToRecentGames(game)
                                        }
@ -120,97 +107,56 @@ struct GameLibraryView: View {
                    }
                }
                .onAppear {
+                    loadGames()
                    loadRecentGames()
                    
+                    
                    let firmware = Ryujinx.shared.fetchFirmwareVersion()
                    firmwareversion = (firmware == "" ? "0" : firmware)
                }
-                .fileImporter(isPresented: $firmwareInstaller, allowedContentTypes: [.item]) { result in
-                    switch result {
-                    case .success(let url):
-                        do {
-                            let fun = url.startAccessingSecurityScopedResource()
-                            let path = url.path
-                            
-                            Ryujinx.shared.installFirmware(firmwarePath: path)
-                            
-                            firmwareversion = (Ryujinx.shared.fetchFirmwareVersion() == "" ? "0" : Ryujinx.shared.fetchFirmwareVersion())
-                            if fun  {
-                                url.stopAccessingSecurityScopedResource()
-                            }
-                        }
-                    case .failure(let error):
-                        print(error)
-                    }
-                }
            }
            .toolbar {
-                ToolbarItem(placement: .topBarLeading) {
-                    Button {
-                        isSelectingGameFile.toggle()
-                    } label: {
-                        Image(systemName: "plus")
-                    }
-                }
-                
                ToolbarItem(placement: .topBarLeading) {
                    Menu {
+                        
                        Text("Firmware Version: \(firmwareversion)")
                            .tint(.white)
                        
                        if firmwareversion == "0" {
                            Button {
-                                DispatchQueue.main.async {
-                                    firmwareInstaller.toggle()
-                                }
+                                firmwareInstaller.toggle()
                            } label: {
                                Text("Install Firmware")
                            }
                            
                        } else {
-                            Menu("Firmware") {
-		                 Button {
-                            showRMFWAlert = true
-                        } label: {
-                            Text("Remove Firmware")
-                        }
-                        .alert(isPresented: $showRMFWAlert) {
-                            Alert(
-                                title: Text("Are you sure?"),
-                                message: Text("Do you really want to remove the firmware?"),
-                                primaryButton: .destructive(Text("Yes")) {
-                                    Ryujinx.shared.removeFirmware()
-                                    let firmware = Ryujinx.shared.fetchFirmwareVersion()
-                                    firmwareversion = (firmware == "" ? "0" : firmware)
-                                },
-                                secondaryButton: .cancel()
-                            )
-                        }
+                            Button {
+                                Ryujinx.shared.removeFirmware()
+                                let firmware = Ryujinx.shared.fetchFirmwareVersion()
+                                firmwareversion = (firmware == "" ? "0" : firmware)
+                            } label: {
+                                Text("Remove Firmware")
+                            }
+                            
+                            
+                            Button {
+                                let game = Game(containerFolder: URL(string: "none")!, fileType: .item, fileURL: URL(string: "MiiMaker")!, titleName: "Mii Maker", titleId: "0", developer: "Nintendo", version: firmwareversion)
                                
-                                Button {
-                                    let game = Game(containerFolder: URL(string: "none")!, fileType: .item, fileURL: URL(string: "MiiMaker")!, titleName: "Mii Maker", titleId: "0", developer: "Nintendo", version: firmwareversion)
-                                    
-                                    self.startemu = game
-                                } label: {
-                                    Text("Mii Maker")
-                                }
-                                Button {
-                                    DispatchQueue.main.async {
-                                        isImporting.toggle()
-                                    }
-                                } label: {
-                                    Text("Open game from system")
-                                }
+                                self.startemu = game
+                            } label: {
+                                Text("Mii Maker")
+                            }
+                            Button {
+                                
+                                isImporting.toggle()
+                            } label: {
+                                Text("Open game from system")
                            }
                        }
                        
                        Button {
                            let documentsUrl = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
-                            var sharedurl = documentsUrl.absoluteString.replacingOccurrences(of: "file://", with: "shareddocuments://")
-                            if ProcessInfo.processInfo.isiOSAppOnMac {
-                                sharedurl = documentsUrl.absoluteString
-                            }
-                            print(sharedurl)
+                            let sharedurl = documentsUrl.absoluteString.replacingOccurrences(of: "file://", with: "shareddocuments://")
                            let furl = URL(string: sharedurl)!
                            if UIApplication.shared.canOpenURL(furl) {
                                UIApplication.shared.open(furl, options: [:])
@ -222,6 +168,7 @@ struct GameLibraryView: View {
                        Image(systemName: "ellipsis.circle")
                            .foregroundColor(.blue)
                    }
+                    
                }
            }
        }
@ -230,7 +177,29 @@ struct GameLibraryView: View {
        .onChange(of: searchText) { _ in
            isSearching = !searchText.isEmpty
        }
-        .fileImporter(isPresented: $isImporting, allowedContentTypes: [.zip, .folder]) { result in
+        .fileImporter(isPresented: $firmwareInstaller, allowedContentTypes: [.item]) { result in
+            switch result {
+                
+            case .success(let url):
+                
+                do {
+                    
+                    let fun = url.startAccessingSecurityScopedResource()
+                    let path = url.path
+                    
+                    Ryujinx.shared.installFirmware(firmwarePath: path)
+                    
+                    firmwareversion = (Ryujinx.shared.fetchFirmwareVersion() == "" ? "0" : Ryujinx.shared.fetchFirmwareVersion())
+                    if fun  {
+                        url.stopAccessingSecurityScopedResource()
+                    }
+                }
+                
+            case .failure(let error):
+                print(error)
+            }
+        }
+        .fileImporter(isPresented: $isImporting, allowedContentTypes: [.zip, .data]) { result in
            switch result {
            case .success(let url):
                guard url.startAccessingSecurityScopedResource() else {
@ -246,61 +215,44 @@ struct GameLibraryView: View {
                    
                    var gameInfo = get_game_info(handle.fileDescriptor, extensionPtr)
                    
-                    let game = Game.convertGameInfoToGame(gameInfo: gameInfo, url: url)
+                    var game = Game(containerFolder: url.deletingLastPathComponent(), fileType: .item, fileURL: url, titleName: "", titleId: "", developer: "", version: "")
+                    
+                    game.titleName = withUnsafePointer(to: &gameInfo.TitleName) {
+                        $0.withMemoryRebound(to: UInt8.self, capacity: MemoryLayout.size(ofValue: $0)) {
+                            String(cString: $0)
+                        }
+                    }
+                    
+                    game.developer = withUnsafePointer(to: &gameInfo.Developer) {
+                        $0.withMemoryRebound(to: UInt8.self, capacity: MemoryLayout.size(ofValue: $0)) {
+                            String(cString: $0)
+                        }
+                    }
+                    
+                    game.titleId = String(gameInfo.TitleId)
+                    
+                    print(String(gameInfo.TitleId))
+                    
+                    
+                    game.version = String(gameInfo.Version)
+                    
+                    game.icon = game.createImage(from: gameInfo)
            
+                    
                    DispatchQueue.main.async {
                        startemu = game
                    }
                } catch {
                    print(error)
                }
+                

            case .failure(let err):
                print("File import failed: \(err.localizedDescription)")
            }
        }
-        .fileImporter(isPresented: $isSelectingGameFile, allowedContentTypes: [.nsp, .xci, .zip, .folder]) { result in
-            switch result {
-            case .success(let url):
-                guard url.startAccessingSecurityScopedResource() else {
-                    print("Failed to access security-scoped resource")
-                    return
-                }
-                defer { url.stopAccessingSecurityScopedResource() }
-                
-                do {
-                    let fileManager = FileManager.default
-                    let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first!
-                    let romsDirectory = documentsDirectory.appendingPathComponent("roms")
-                    
-                    if !fileManager.fileExists(atPath: romsDirectory.path) {
-                        try fileManager.createDirectory(at: romsDirectory, withIntermediateDirectories: true, attributes: nil)
-                    }
-                    
-                    let destinationURL = romsDirectory.appendingPathComponent(url.lastPathComponent)
-                    try fileManager.copyItem(at: url, to: destinationURL)
-                    
-                    Ryujinx.shared.games = Ryujinx.shared.loadGames()
-                } catch {
-                    print("Error copying game file: \(error)")
-                }
-            case .failure(let err):
-                print("File import failed: \(err.localizedDescription)")
-            }
-        }
-        .sheet(isPresented: Binding(
-            get: { isViewingGameInfo && gameInfo != nil },
-            set: { newValue in
-                if !newValue {
-                    isViewingGameInfo = false
-                    gameInfo = nil
-                }
-            }
-        )) {
-            if let game = gameInfo {
-                GameInfoSheet(game: game)
-            }
-        }
+
+
    }
    
    
@ -335,22 +287,68 @@ struct GameLibraryView: View {
            recentGames = []
        }
    }
-
    
-// MARK: - Delete Game Function
-    func deleteGame(game: Game) {
+    private func loadGames() {
        let fileManager = FileManager.default
+        guard let documentsDirectory = fileManager.urls(for: .documentDirectory, in: .userDomainMask).first else { return }
+        
+        let romsDirectory = documentsDirectory.appendingPathComponent("roms")
+        
+        // Check if "roms" folder exists; if not, create it
+        if !fileManager.fileExists(atPath: romsDirectory.path) {
+            do {
+                try fileManager.createDirectory(at: romsDirectory, withIntermediateDirectories: true, attributes: nil)
+            } catch {
+                print("Failed to create roms directory: \(error)")
+            }
+        }
+        games = []
+        // Load games only from "roms" folder
        do {
-            try fileManager.removeItem(at: game.fileURL)
-            Ryujinx.shared.games.removeAll { $0.id == game.id }
-            Ryujinx.shared.games = Ryujinx.shared.loadGames()
+            let files = try fileManager.contentsOfDirectory(at: romsDirectory, includingPropertiesForKeys: nil)
+            
+            files.forEach { fileURLCandidate in
+                do {
+                    let handle = try FileHandle(forReadingFrom: fileURLCandidate)
+                    let fileExtension = (fileURLCandidate.pathExtension as NSString).utf8String
+                    let extensionPtr = UnsafeMutablePointer<CChar>(mutating: fileExtension)
+                    
+                    var gameInfo = get_game_info(handle.fileDescriptor, extensionPtr)
+                    
+                    var game = Game(containerFolder: romsDirectory, fileType: .item, fileURL: fileURLCandidate, titleName: "", titleId: "", developer: "", version: "")
+                    
+                    game.titleName = withUnsafePointer(to: &gameInfo.TitleName) {
+                        $0.withMemoryRebound(to: UInt8.self, capacity: MemoryLayout.size(ofValue: $0)) {
+                            String(cString: $0)
+                        }
+                    }
+                    
+                    game.developer = withUnsafePointer(to: &gameInfo.Developer) {
+                        $0.withMemoryRebound(to: UInt8.self, capacity: MemoryLayout.size(ofValue: $0)) {
+                            String(cString: $0)
+                        }
+                    }
+                    
+                    game.titleId = String(gameInfo.TitleId)
+                    
+                    
+                    game.version = String(gameInfo.Version)
+                    
+                    game.icon = game.createImage(from: gameInfo)
+            
+                    
+                    games.append(game)
+                } catch {
+                    print(error)
+                }
+            }
+            
        } catch {
-            print("Error deleting game: \(error)")
+            print("Error loading games from roms folder: \(error)")
        }
    }
 }

-// MARK: -Game Model
 extension Game: Codable {
    enum CodingKeys: String, CodingKey {
        case titleName, titleId, developer, version, fileURL
@ -379,7 +377,6 @@ extension Game: Codable {
    }
 }

-// MARK: -Recent Game Card
 struct RecentGameCard: View {
    let game: Game
    @Binding var startemu: Game?
@ -426,15 +423,9 @@ struct RecentGameCard: View {
    }
 }

-// MARK: -Game List Item
 struct GameListRow: View {
    let game: Game
    @Binding var startemu: Game?
-    @Binding var games: [Game] // Add this binding
-    @Binding var isViewingGameInfo: Bool
-    @Binding var gameInfo: Game?
-    @State var gametoDelete: Game?
-    @State var showGameDeleteConfirmation: Bool = false
    @Environment(\.colorScheme) var colorScheme
    
    var body: some View {
@ -484,52 +475,19 @@ struct GameListRow: View {
            .padding(.vertical, 8)
            .background(Color(.systemBackground))
            .contextMenu {
-                Section {
-                    Button {
-                        startemu = game
-                    } label: {
-                        Label("Play Now", systemImage: "play.fill")
-                    }
-                    
-                    Button {
-                        gameInfo = game
-                        isViewingGameInfo.toggle()
-                    } label: {
-                        Label("Game Info", systemImage: "info.circle")
-                    }
+                Button {
+                    startemu = game
+                } label: {
+                    Label("Play Now", systemImage: "play.fill")
                }
                
-                Section {
-                    Button(role: .destructive) {
-                        gametoDelete = game
-                        showGameDeleteConfirmation.toggle()
-                    } label: {
-                        Label("Delete", systemImage: "trash")
-                    }
+                Button {
+                    // Add info action
+                } label: {
+                    Label("Game Info", systemImage: "info.circle")
                }
            }
        }
        .buttonStyle(.plain)
-        .confirmationDialog("Are you sure you want to delete this game?", isPresented: $showGameDeleteConfirmation) {
-            Button("Delete", role: .destructive) {
-                if let game = gametoDelete {
-                    deleteGame(game: game)
-                }
-            }
-            Button("Cancel", role: .cancel) {}
-        } message: {
-            Text("Are you sure you want to delete \(gametoDelete?.titleName ?? "this game")?")
-        }
-    }
-    
-    private func deleteGame(game: Game) {
-        let fileManager = FileManager.default
-        do {
-            try fileManager.removeItem(at: game.fileURL)
-            games.removeAll { $0.id == game.id }
-        } catch {
-            print("Error deleting game: \(error)")
-        }
    }
 }
-
--- a/src/MeloNX/MeloNX/App/Views/Logging/Logs.swift
+++ b/src/MeloNX/MeloNX/App/Views/Logging/Logs.swift
@ -1,100 +0,0 @@
-//
-//  LogEntry.swift
-//  MeloNX
-//
-//  Created by Stossy11 on 09/02/2025.
-//
-
-
-import SwiftUI
-
-struct LogEntry: Identifiable, Equatable {
-    let id = UUID()
-    let text: String
-
-    static func == (lhs: LogEntry, rhs: LogEntry) -> Bool {
-        return lhs.id == rhs.id && lhs.text == rhs.text
-    }
-}
-
-struct LogViewer: View {
-    @State private var logs: [LogEntry] = []
-    @State private var latestLogFilePath: String?
-
-    var body: some View {
-        VStack {
-            Spacer()
-            VStack {
-                ForEach(logs) { log in
-                    Text(log.text)
-                        .padding(4)
-                        .background(Color.black.opacity(0.7))
-                        .foregroundColor(.white)
-                        .cornerRadius(8)
-                        .transition(.move(edge: .top).combined(with: .opacity))
-                        .animation(.easeOut(duration: 2), value: logs)
-                }
-            }
-            .frame(maxWidth: .infinity)
-            .padding()
-        }
-        .edgesIgnoringSafeArea(.all)
-        .onAppear {
-            findNewestLogFile()
-        }
-    }
-
-    func findNewestLogFile() {
-        let logsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first?.appendingPathComponent("logs")
-
-        guard let directory = logsDirectory else { return }
-        
-        do {
-            let logFiles = try FileManager.default.contentsOfDirectory(at: directory, includingPropertiesForKeys: [.contentModificationDateKey], options: .skipsHiddenFiles)
-            
-            // Sort files by modification date (newest first)
-            let sortedFiles = logFiles.sorted {
-                (try? $0.resourceValues(forKeys: [.contentModificationDateKey]).contentModificationDate) ?? Date.distantPast >
-                (try? $1.resourceValues(forKeys: [.contentModificationDateKey]).contentModificationDate) ?? Date.distantPast
-            }
-            
-            if let newestLogFile = sortedFiles.first {
-                latestLogFilePath = newestLogFile.path
-                startReadingLogFile()
-            }
-        } catch {
-            print("Error reading log files: \(error)")
-        }
-    }
-
-    func startReadingLogFile() {
-        guard let path = latestLogFilePath else { return }
-        let fileHandle = try? FileHandle(forReadingAtPath: path)
-        fileHandle?.seekToEndOfFile()
-        
-        NotificationCenter.default.addObserver(forName: .NSFileHandleDataAvailable, object: fileHandle, queue: .main) { _ in
-            if let data = fileHandle?.availableData, !data.isEmpty {
-                if let logLine = String(data: data, encoding: .utf8)?.trimmingCharacters(in: .whitespacesAndNewlines) {
-                    DispatchQueue.main.async {
-                        withAnimation {
-                            logs.append(LogEntry(text: logLine))
-                        }
-                        // Remove old logs after a delay
-                        DispatchQueue.main.asyncAfter(deadline: .now() + 3) {
-                            withAnimation {
-                                removelogfirst()
-                            }
-                        }
-                    }
-                }
-            }
-            fileHandle?.waitForDataInBackgroundAndNotify()
-        }
-        
-        fileHandle?.waitForDataInBackgroundAndNotify()
-    }
-    
-    func removelogfirst() {
-        logs.removeFirst()
-    }
-}
--- a/src/MeloNX/MeloNX/App/Views/SettingsView/SettingsView.swift
+++ b/src/MeloNX/MeloNX/App/Views/SettingsView/SettingsView.swift
@ -18,8 +18,6 @@ struct SettingsView: View {
    @Binding var onscreencontroller: Controller
    @AppStorage("useTrollStore") var useTrollStore: Bool = false
    
-    @AppStorage("jitStreamerEB") var jitStreamerEB: Bool = false
-    
    @AppStorage("ignoreJIT") var ignoreJIT: Bool = false
    
    var memoryManagerModes = [
@ -31,18 +29,9 @@ struct SettingsView: View {
    @AppStorage("RyuDemoControls") var ryuDemo: Bool = false
    @AppStorage("MTL_HUD_ENABLED") var metalHUDEnabled: Bool = false
    
-    @AppStorage("showScreenShotButton") var ssb: Bool = false
-    
-    @AppStorage("MVK_CONFIG_PREFILL_METAL_COMMAND_BUFFERS") var mVKPreFillBuffer: Bool = false
-    @AppStorage("MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS") var syncqsubmits: Bool = false
-    
    @AppStorage("performacehud") var performacehud: Bool = false
    
-    @AppStorage("oldWindowCode") var windowCode: Bool = false
-    
-    
    @State private var showResolutionInfo = false
-    @State private var showAnisotropicInfo = false
    @State private var searchText = ""
    
    var filteredMemoryModes: [(String, String)] {
@ -50,49 +39,35 @@ struct SettingsView: View {
        return memoryManagerModes.filter { $0.1.localizedCaseInsensitiveContains(searchText) }
    }
    
-    
+
    var body: some View {
        iOSNav {
            List {
-                
-                
+
+                    
                // Graphics & Performance
                Section {
-                    Picker(selection: $config.aspectRatio) {
-                        ForEach(AspectRatio.allCases, id: \.self) { ratio in
-                            Text(ratio.displayName).tag(ratio)
-                        }
-                    } label: {
-                        labelWithIcon("Aspect Ratio", iconName: "rectangle.expand.vertical")
+                    Toggle(isOn: $config.fullscreen) {
+                        labelWithIcon("Fullscreen", iconName: "rectangle.expand.vertical")
                    }
                    .tint(.blue)
-                    
+
                    Toggle(isOn: $config.disableShaderCache) {
                        labelWithIcon("Shader Cache", iconName: "memorychip")
                    }
                    .tint(.blue)
-                    
-                    Toggle(isOn: $config.disablevsync) {
-                        labelWithIcon("Disable VSync", iconName: "arrow.triangle.2.circlepath")
-                    }
-                    .tint(.blue)
-                    
-                    
+
                    Toggle(isOn: $config.enableTextureRecompression) {
                        labelWithIcon("Texture Recompression", iconName: "rectangle.compress.vertical")
                    }
                    .tint(.blue)
-                    
+
                    Toggle(isOn: $config.disableDockedMode) {
                        labelWithIcon("Docked Mode", iconName: "dock.rectangle")
                    }
                    .tint(.blue)
                    
-                    Toggle(isOn: $config.macroHLE) {
-                        labelWithIcon("Macro HLE", iconName: "gearshape")
-                    }.tint(.blue)
-                        
-                    
+                                                        
                    VStack(alignment: .leading, spacing: 10) {
                        HStack {
                            labelWithIcon("Resolution Scale", iconName: "magnifyingglass")
@ -115,8 +90,8 @@ struct SettingsView: View {
                                )
                            }
                        }
-                        
-                        Slider(value: $config.resscale, in: 0.1...3.0, step: 0.05) {
+
+                        Slider(value: $config.resscale, in: 0.1...3.0, step: 0.1) {
                            Text("Resolution Scale")
                        } minimumValueLabel: {
                            Text("0.1x")
@ -132,46 +107,6 @@ struct SettingsView: View {
                            .foregroundColor(.secondary)
                    }
                    .padding(.vertical, 8)
-                    
-                    VStack(alignment: .leading, spacing: 10) {
-                        HStack {
-                            labelWithIcon("Max Anisotropic Scale", iconName: "magnifyingglass")
-                                .font(.headline)
-                            Spacer()
-                            Button {
-                                showAnisotropicInfo.toggle()
-                            } label: {
-                                Image(systemName: "info.circle")
-                                    .symbolRenderingMode(.hierarchical)
-                                    .foregroundStyle(.secondary)
-                            }
-                            .buttonStyle(.plain)
-                            .help("Learn more about Max Anisotropic Scale")
-                            .alert(isPresented: $showAnisotropicInfo) {
-                                Alert(
-                                    title: Text("Max Anisotripic Scale"),
-                                    message: Text("Adjust the internal Anisotropic resolution. Higher values improve visuals but may reduce performance. Default at 0 lets game decide."),
-                                    dismissButton: .default(Text("OK"))
-                                )
-                            }
-                        }
-
-                        Slider(value: $config.maxAnisotropy, in: 0...16.0, step: 0.1) {
-                            Text("Resolution Scale")
-                        } minimumValueLabel: {
-                            Text("0x")
-                                .font(.footnote)
-                                .foregroundColor(.secondary)
-                        } maximumValueLabel: {
-                            Text("16.0x")
-                                .font(.footnote)
-                                .foregroundColor(.secondary)
-                        }
-                        Text("\(config.maxAnisotropy, specifier: "%.2f")x")
-                            .font(.subheadline)
-                            .foregroundColor(.secondary)
-                    }
-                    .padding(.vertical, 8)

                    Toggle(isOn: $performacehud) {
                        labelWithIcon("Performance Overlay", iconName: "speedometer")
@ -215,7 +150,7 @@ struct SettingsView: View {
                    
                    
                    
-                    ForEach(currentControllers) { controller in
+                    ForEach(controllersList) { controller in
                        
                        var customBinding: Binding<Bool> {
                            Binding(
@ -239,28 +174,15 @@ struct SettingsView: View {
                                        .font(.body)
                                }
                                .tint(.blue)
-                                .onDrag({ NSItemProvider() })
                            } label: {
+                                let controller = String((controllersList.firstIndex(where: { $0.id == controller.id }) ?? 0) + 1)
                                
-                                if let controller = currentControllers.firstIndex(where: { $0.id == controller.id } )  {
-                                    Text("Player \(controller + 1)")
-                                        .onAppear() {
-                                            // print(currentControllers.firstIndex(where: { $0.id == controller.id }) ?? 0)
-                                            print(currentControllers.count)
-                                            
-                                            if currentControllers.count > 2 {
-                                                print(currentControllers[1])
-                                                print(currentControllers[2])
-                                            }
-                                        }
-                                }
+                                
+                                Text("Player \(controller)")
                            }
                            
                        }
                    }
-                    .onMove { from, to in
-                        currentControllers.move(fromOffsets: from, toOffset: to)
-                    }
                } header: {
                    Text("Input Selector")
                        .font(.title3.weight(.semibold))
@ -269,7 +191,7 @@ struct SettingsView: View {
                } footer: {
                    Text("Select input devices and on-screen controls to play with. ")
                }
-                
+
                // Input Settings
                Section {
                    
@ -277,7 +199,7 @@ struct SettingsView: View {
                        labelWithIcon("List Input IDs", iconName: "list.bullet")
                    }
                    .tint(.blue)
-                    
+
                    Toggle(isOn: $ryuDemo) {
                        labelWithIcon("On-Screen Controller (Demo)", iconName: "hand.draw")
                    }
@ -307,12 +229,8 @@ struct SettingsView: View {
                        }
                    }
                    
-                    Toggle(isOn: $config.disablePTC) {
-                        labelWithIcon("Disable PTC", iconName: "cpu")
-                    }.tint(.blue)
-                    
                    if let cpuInfo = getCPUInfo(), cpuInfo.hasPrefix("Apple M") {
-                        if #available (iOS 16.4, *) {
+                        if #available (iOS 16.4, *), (false) {
                            Toggle(isOn: .constant(false)) {
                                labelWithIcon("Hypervisor", iconName: "bolt.fill")
                            }
@ -321,18 +239,21 @@ struct SettingsView: View {
                            .onAppear() {
                                print("CPU Info: \(cpuInfo)")
                            }
-                        } else if getEntitlementValue("com.apple.private.hypervisor") {
+                        } else {
                            Toggle(isOn: $config.hypervisor) {
                                labelWithIcon("Hypervisor", iconName: "bolt.fill")
                            }
                            .tint(.blue)
                            .onAppear() {
                                print("CPU Info: \(cpuInfo)")
+                                
                            }
                        }
+                        
                    }
+
                } header: {
-                    Text("CPU")
+                    Text("CPU Mode")
                        .font(.title3.weight(.semibold))
                        .textCase(nil)
                        .headerProminence(.increased)
@ -340,127 +261,37 @@ struct SettingsView: View {
                    Text("Select how memory is managed. 'Host (fast)' is best for most users.")
                }

-            
-            Section {
-                
-                
-                Toggle(isOn: $config.expandRam) {
-                    labelWithIcon("Expand Guest Ram (6GB)", iconName: "exclamationmark.bubble")
-                }
-                .tint(.red)
-
-                Toggle(isOn: $config.ignoreMissingServices) {
-                    labelWithIcon("Ignore Missing Services", iconName: "waveform.path")
-                }
-                .tint(.red)
-            } header: {
-                Text("Hacks")
-                    .font(.title3.weight(.semibold))
-                    .textCase(nil)
-                    .headerProminence(.increased)
-            }

                // Other Settings
                Section {
                    
-                    Toggle(isOn: $ssb) {
-                        labelWithIcon("Screenshot Button", iconName: "square.and.arrow.up")
+                    Toggle(isOn: $useTrollStore) {
+                        labelWithIcon("TrollStore", iconName: "troll.svg")
                    }
                    .tint(.blue)
                    
-                    if #available(iOS 17.0.1, *) {
-                        Toggle(isOn: $jitStreamerEB) {
-                            labelWithIcon("JitStreamer EB", iconName: "bolt.heart")
-                        }
-                        .tint(.blue)
-                        .contextMenu {
-                            Button {
-                                if let mainWindow = UIApplication.shared.windows.last {
-                                    let alertController = UIAlertController(title: "About JitStreamer EB", message: "JitStreamer EB is an Amazing Application to Enable JIT on the go, made by one of the best iOS developers of all time jkcoxson <3", preferredStyle: .alert)
-                                    
-                                    let learnMoreButton = UIAlertAction(title: "Learn More", style: .default) {_ in
-                                        UIApplication.shared.open(URL(string: "https://jkcoxson.com/jitstreamer")!)
-                                    }
-                                    alertController.addAction(learnMoreButton)
-                                    
-                                    let doneButton = UIAlertAction(title: "Done", style: .cancel, handler: nil)
-                                    alertController.addAction(doneButton)
-                                    
-                                    mainWindow.rootViewController?.present(alertController, animated: true)
-                                }
-                            } label: {
-                                Text("About")
-                            }
-                        }
-                    } else {
-                        Toggle(isOn: $useTrollStore) {
-                            labelWithIcon("TrollStore JIT", iconName: "troll.svg")
-                        }
-                        .tint(.blue)
+                    Toggle(isOn: $config.debuglogs) {
+                        labelWithIcon("Debug Logs", iconName: "exclamationmark.bubble")
                    }
-                    
-                    Toggle(isOn: $syncqsubmits) {
-                        labelWithIcon("MVK: Synchronous Queue Submits", iconName: "line.diagonal")
-                    }.tint(.blue)
-                        .contextMenu() {
-                            Button {
-                                if let mainWindow = UIApplication.shared.windows.last {
-                                    let alertController = UIAlertController(title: "About MVK: Synchronous Queue Submits", message: "Enable this option if Mario Kart 8 is crashing at Grand Prix mode.", preferredStyle: .alert)
-                                    
-                                    let doneButton = UIAlertAction(title: "OK", style: .cancel, handler: nil)
-                                    alertController.addAction(doneButton)
-                                    
-                                    mainWindow.rootViewController?.present(alertController, animated: true)
-                                }
-                            } label: {
-                                Text("About")
-                            }
-                        }
-                    
-                    DisclosureGroup {
-                        Toggle(isOn: $config.debuglogs) {
-                            labelWithIcon("Debug Logs", iconName: "exclamationmark.bubble")
-                        }
-                        .tint(.blue)
-                        
-                        Toggle(isOn: $config.tracelogs) {
-                            labelWithIcon("Trace Logs", iconName: "waveform.path")
-                        }
-                        .tint(.blue)
-                    } label: {
-                        Text("Logs")
+                    .tint(.blue)
+
+                    Toggle(isOn: $config.tracelogs) {
+                        labelWithIcon("Trace Logs", iconName: "waveform.path")
                    }
-                    
+                    .tint(.blue)
                } header: {
                    Text("Miscellaneous Options")
                        .font(.title3.weight(.semibold))
                        .textCase(nil)
                        .headerProminence(.increased)
                } footer: {
-                    Text("Enable trace and debug logs for advanced troubleshooting (Note: This degrades performance),\nEnable Screenshot Button for better screenshots\nand Enable TrollStore for automatic TrollStore JIT.")
+                    Text("Enable logs for troubleshooting and Enable automatic TrollStore JIT.")
                }
-                
+
                // Advanced
                Section {
-                    labelWithIcon("JIT Acquisition: \(isJITEnabled() ? "Acquired" : "Not Acquired" )", iconName: "bolt.fill")
-                    
-                    if #unavailable(iOS 17) {
-                        Toggle(isOn: $windowCode) {
-                            labelWithIcon("SDL Window", iconName: "macwindow.on.rectangle")
-                        }
-                        .tint(.blue)
-                    }
-                    
                    DisclosureGroup {
-                        
-                        Toggle(isOn: $mVKPreFillBuffer) {
-                            labelWithIcon("MVK: Pre-Fill Metal Command Buffers", iconName: "gearshape")
-                        }.tint(.blue)
-                        
-                        Toggle(isOn: $config.dfsIntegrityChecks) {
-                            labelWithIcon("Disable FS Integrity Checks", iconName: "checkmark.shield")
-                        }.tint(.blue)
-                        
+
                        HStack {
                            labelWithIcon("Page Size", iconName: "textformat.size")
                            Spacer()
@ -468,7 +299,7 @@ struct SettingsView: View {
                                .foregroundColor(.secondary)
                            
                        }
-                        
+
                        TextField("Additional Arguments", text: Binding(
                            get: {
                                config.additionalArgs.joined(separator: " ")
@ -490,8 +321,6 @@ struct SettingsView: View {
                            Text("Remove Firmware")
                                .font(.body)
                        }
-                        
-                        
                    } label: {
                        Text("Advanced Options")
                    }
@ -501,11 +330,7 @@ struct SettingsView: View {
                        .textCase(nil)
                        .headerProminence(.increased)
                } footer: {
-                    if #available(iOS 17, *) {
-                        Text("For advanced users. See page size or add custom arguments for experimental features. (Please don't touch this if you don't know what you're doing).")
-                    } else {
-                        Text("For advanced users. See page size or add custom arguments for experimental features. (Please don't touch this if you don't know what you're doing). If the emulation is not showing (you may hear audio in some games), try enabling \"SDL Window\"")
-                    }
+                    Text("For advanced users. See page size or add custom arguments for experimental features. (Please don't touch this if you don't know what you're doing)")
                }
                
            }
@ -533,6 +358,16 @@ struct SettingsView: View {
        }
    }
    
+    func getCPUInfo() -> String? {
+        let device = MTLCreateSystemDefaultDevice()
+        
+        let gpu = device?.name
+        print("GPU: " + (gpu ?? ""))
+        print(config.hypervisor)
+        return gpu
+    }
+
+    
    func saveSettings() {
 #if targetEnvironment(simulator)
        
@ -550,15 +385,6 @@ struct SettingsView: View {
 #endif
    }
    
-    func getCPUInfo() -> String? {
-        let device = MTLCreateSystemDefaultDevice()
-        
-        let gpu = device?.name
-        print("GPU: " + (gpu ?? ""))
-        return gpu
-    }
-
-    
    // Original loadSettings function assumed to exist
    func loadSettings() -> Ryujinx.Configuration? {
        
@ -608,6 +434,8 @@ struct SettingsView: View {
 }


+
+
 struct SVGView: UIViewRepresentable {
    var svgName: String
    var color: Color = Color.black
--- a/Libraries/RyujinxKeyboard.framework/Headers/RyujinxKeyboard.h
+++ b/Libraries/RyujinxKeyboard.framework/Headers/RyujinxKeyboard.h
@ -1,18 +0,0 @@
-//
-//  RyujinxKeyboard.h
-//  RyujinxKeyboard
-//
-//  Created by Stossy11 on 11/02/2025.
-//
-
-#import <Foundation/Foundation.h>
-
-//! Project version number for RyujinxKeyboard.
-FOUNDATION_EXPORT double RyujinxKeyboardVersionNumber;
-
-//! Project version string for RyujinxKeyboard.
-FOUNDATION_EXPORT const unsigned char RyujinxKeyboardVersionString[];
-
-// In this header, you should import all the public headers of your framework using statements like #import <RyujinxKeyboard/PublicHeader.h>
-
-
--- a/Libraries/RyujinxKeyboard.framework/Modules/module.modulemap
+++ b/Libraries/RyujinxKeyboard.framework/Modules/module.modulemap
@ -1,6 +0,0 @@
-framework module RyujinxKeyboard {
-  umbrella header "RyujinxKeyboard.h"
-  export *
-
-  module * { export * }
-}
--- a/Libraries/RyujinxKeyboard.framework/RyujinxKeyboard
+++ b/Libraries/RyujinxKeyboard.framework/RyujinxKeyboard
--- a/Libraries/RyujinxKeyboard.framework/_CodeSignature/CodeResources
+++ b/Libraries/RyujinxKeyboard.framework/_CodeSignature/CodeResources
@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>files</key>
-	<dict>
-		<key>Headers/RyujinxKeyboard.h</key>
-		<data>
-		5P7GN4g050n199pV6/+SpfMBgJc=
-		</data>
-		<key>Info.plist</key>
-		<data>
-		hYdI/ktAKwjBSfaJpt6Yc8UKLCY=
-		</data>
-		<key>Modules/module.modulemap</key>
-		<data>
-		0kFAMoTn+4Q1J/dM6uMLe3EhbL0=
-		</data>
-	</dict>
-	<key>files2</key>
-	<dict>
-		<key>Headers/RyujinxKeyboard.h</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			/yGmHq9NdBF/ruesISIj7vml0ySgoJkrFOcrw0vaIxQ=
-			</data>
-		</dict>
-		<key>Modules/module.modulemap</key>
-		<dict>
-			<key>hash2</key>
-			<data>
-			K+ZyxKhTI4bMVZuHBIspvd2PFqvCOlVUFYmwF96O5NQ=
-			</data>
-		</dict>
-	</dict>
-	<key>rules</key>
-	<dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^version.plist$</key>
-		<true/>
-	</dict>
-	<key>rules2</key>
-	<dict>
-		<key>.*\.dSYM($|/)</key>
-		<dict>
-			<key>weight</key>
-			<real>11</real>
-		</dict>
-		<key>^(.*/)?\.DS_Store$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>2000</real>
-		</dict>
-		<key>^.*</key>
-		<true/>
-		<key>^.*\.lproj/</key>
-		<dict>
-			<key>optional</key>
-			<true/>
-			<key>weight</key>
-			<real>1000</real>
-		</dict>
-		<key>^.*\.lproj/locversion.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>1100</real>
-		</dict>
-		<key>^Base\.lproj/</key>
-		<dict>
-			<key>weight</key>
-			<real>1010</real>
-		</dict>
-		<key>^Info\.plist$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^PkgInfo$</key>
-		<dict>
-			<key>omit</key>
-			<true/>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^embedded\.provisionprofile$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-		<key>^version\.plist$</key>
-		<dict>
-			<key>weight</key>
-			<real>20</real>
-		</dict>
-	</dict>
-</dict>
-</plist>
--- a/Libraries/SoftwareKeyboard.framework/Headers/SoftwareKeyboard.h
+++ b/Libraries/SoftwareKeyboard.framework/Headers/SoftwareKeyboard.h
@ -0,0 +1,18 @@
+//
+//  SoftwareKeyboard.h
+//  SoftwareKeyboard
+//
+//  Created by Stossy11 on 19/12/2024.
+//
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for SoftwareKeyboard.
+FOUNDATION_EXPORT double SoftwareKeyboardVersionNumber;
+
+//! Project version string for SoftwareKeyboard.
+FOUNDATION_EXPORT const unsigned char SoftwareKeyboardVersionString[];
+
+// In this header, you should import all the public headers of your framework using statements like #import <SoftwareKeyboard/PublicHeader.h>
+
+
--- a/Libraries/SoftwareKeyboard.framework/Info.plist
+++ b/Libraries/SoftwareKeyboard.framework/Info.plist
--- a/Libraries/SoftwareKeyboard.framework/Modules/SoftwareKeyboard.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo
+++ b/Libraries/SoftwareKeyboard.framework/Modules/SoftwareKeyboard.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo
--- a/Libraries/SoftwareKeyboard.framework/Modules/SoftwareKeyboard.swiftmodule/arm64-apple-ios.abi.json
+++ b/Libraries/SoftwareKeyboard.framework/Modules/SoftwareKeyboard.swiftmodule/arm64-apple-ios.abi.json
--- a/Libraries/SoftwareKeyboard.framework/Modules/SoftwareKeyboard.swiftmodule/arm64-apple-ios.private.swiftinterface
+++ b/Libraries/SoftwareKeyboard.framework/Modules/SoftwareKeyboard.swiftmodule/arm64-apple-ios.private.swiftinterface
@ -0,0 +1,38 @@
+// swift-interface-format-version: 1.0
+// swift-compiler-version: Apple Swift version 6.0.3 effective-5.10 (swiftlang-6.0.3.1.4 clang-1600.0.30)
+// swift-module-flags: -target arm64-apple-ios14.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -enable-experimental-feature OpaqueTypeErasure -enable-bare-slash-regex -module-name SoftwareKeyboard
+@_exported import SoftwareKeyboard
+import Swift
+import UIKit
+import _Concurrency
+import _StringProcessing
+import _SwiftConcurrencyShims
+@objc public enum KeyboardMode : Swift.UInt32 {
+  case `default` = 0
+  case numeric = 1
+  case ascii = 2
+  case fullLatin = 3
+  case alphabet = 4
+  case simplifiedChinese = 5
+  case traditionalChinese = 6
+  case korean = 7
+  case languageSet2 = 8
+  case languageSet2Latin = 9
+  public init?(rawValue: Swift.UInt32)
+  public typealias RawValue = Swift.UInt32
+  public var rawValue: Swift.UInt32 {
+    get
+  }
+}
+public struct SoftwareKeyboardUiArgs {
+  public var keyboardMode: SoftwareKeyboard.KeyboardMode
+  public var headerText: Swift.String
+  public var subtitleText: Swift.String
+  public var submitText: Swift.String
+  public var stringLengthMin: Swift.Int32
+  public var stringLengthMax: Swift.Int32
+  public var initialText: Swift.String?
+}
+extension SoftwareKeyboard.KeyboardMode : Swift.Equatable {}
+extension SoftwareKeyboard.KeyboardMode : Swift.Hashable {}
+extension SoftwareKeyboard.KeyboardMode : Swift.RawRepresentable {}
--- a/Libraries/SoftwareKeyboard.framework/Modules/SoftwareKeyboard.swiftmodule/arm64-apple-ios.swiftdoc
+++ b/Libraries/SoftwareKeyboard.framework/Modules/SoftwareKeyboard.swiftmodule/arm64-apple-ios.swiftdoc
--- a/Libraries/SoftwareKeyboard.framework/Modules/SoftwareKeyboard.swiftmodule/arm64-apple-ios.swiftinterface
+++ b/Libraries/SoftwareKeyboard.framework/Modules/SoftwareKeyboard.swiftmodule/arm64-apple-ios.swiftinterface
@ -0,0 +1,38 @@
+// swift-interface-format-version: 1.0
+// swift-compiler-version: Apple Swift version 6.0.3 effective-5.10 (swiftlang-6.0.3.1.4 clang-1600.0.30)
+// swift-module-flags: -target arm64-apple-ios14.0 -enable-objc-interop -enable-library-evolution -swift-version 5 -enforce-exclusivity=checked -Onone -enable-experimental-feature OpaqueTypeErasure -enable-bare-slash-regex -module-name SoftwareKeyboard
+@_exported import SoftwareKeyboard
+import Swift
+import UIKit
+import _Concurrency
+import _StringProcessing
+import _SwiftConcurrencyShims
+@objc public enum KeyboardMode : Swift.UInt32 {
+  case `default` = 0
+  case numeric = 1
+  case ascii = 2
+  case fullLatin = 3
+  case alphabet = 4
+  case simplifiedChinese = 5
+  case traditionalChinese = 6
+  case korean = 7
+  case languageSet2 = 8
+  case languageSet2Latin = 9
+  public init?(rawValue: Swift.UInt32)
+  public typealias RawValue = Swift.UInt32
+  public var rawValue: Swift.UInt32 {
+    get
+  }
+}
+public struct SoftwareKeyboardUiArgs {
+  public var keyboardMode: SoftwareKeyboard.KeyboardMode
+  public var headerText: Swift.String
+  public var subtitleText: Swift.String
+  public var submitText: Swift.String
+  public var stringLengthMin: Swift.Int32
+  public var stringLengthMax: Swift.Int32
+  public var initialText: Swift.String?
+}
+extension SoftwareKeyboard.KeyboardMode : Swift.Equatable {}
+extension SoftwareKeyboard.KeyboardMode : Swift.Hashable {}
+extension SoftwareKeyboard.KeyboardMode : Swift.RawRepresentable {}
--- a/Libraries/SoftwareKeyboard.framework/Modules/SoftwareKeyboard.swiftmodule/arm64-apple-ios.swiftmodule
+++ b/Libraries/SoftwareKeyboard.framework/Modules/SoftwareKeyboard.swiftmodule/arm64-apple-ios.swiftmodule
--- a/Libraries/SoftwareKeyboard.framework/Modules/module.modulemap
+++ b/Libraries/SoftwareKeyboard.framework/Modules/module.modulemap
@ -0,0 +1,6 @@
+framework module SoftwareKeyboard {
+  umbrella header "SoftwareKeyboard.h"
+  export *
+
+  module * { export * }
+}
--- a/Libraries/SoftwareKeyboard.framework/SoftwareKeyboard
+++ b/Libraries/SoftwareKeyboard.framework/SoftwareKeyboard
--- a/src/MeloNX/MeloNX/Dependencies/Dynamic
+++ b/src/MeloNX/MeloNX/Dependencies/Dynamic
--- a/src/MeloNX/MeloNX/Dependencies/XCFrameworks/MoltenVK.xcframework/ios-arm64/MoltenVK.framework/MoltenVK
+++ b/src/MeloNX/MeloNX/Dependencies/XCFrameworks/MoltenVK.xcframework/ios-arm64/MoltenVK.framework/MoltenVK
--- a/src/MeloNX/MeloNX/Info.plist
+++ b/src/MeloNX/MeloNX/Info.plist
@ -2,73 +2,9 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>com.stossy11.MeloNX</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>melonx</string>
-			</array>
-		</dict>
-	</array>
-	<key>LSApplicationQueriesSchemes</key>
-	<array>
-		<string>melonx</string>
-	</array>
 	<key>MeloID</key>
-	<string>83f67a0a96bd8628a150d7853e360db5bae64e7769524fae399c4b8e7e6aff17</string>
-	<key>NSUserActivityTypes</key>
-	<array>
-		<string>LaunchGameIntent</string>
-	</array>
+	<string>1d0e26921bac938456ee7210ff4f2fa701dc16c02de1760e0aa757db28818ec7</string>
 	<key>UIFileSharingEnabled</key>
 	<true/>
-	<key>UTExportedTypeDeclarations</key>
-	<array>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>public.data</string>
-				<string>public.archive</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>Nintendo Switch Package</string>
-			<key>UTTypeIdentifier</key>
-			<string>com.nintendo.switch-package</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<array>
-					<string>nsp</string>
-				</array>
-				<key>public.mime-type</key>
-				<string>application/x-nsp</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>public.data</string>
-				<string>public.archive</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>Nintendo Switch Cartridge</string>
-			<key>UTTypeIdentifier</key>
-			<string>com.nintendo.switch-cartridge</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<array>
-					<string>xci</string>
-				</array>
-				<key>public.mime-type</key>
-				<string>application/x-xci</string>
-			</dict>
-		</dict>
-	</array>
 </dict>
 </plist>
--- a/src/MeloNX/MeloNX/MeloNX.entitlements
+++ b/src/MeloNX/MeloNX/MeloNX.entitlements
@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.kernel.increased-debugging-memory-limit</key>
+	<true/>
 	<key>com.apple.developer.kernel.increased-memory-limit</key>
 	<true/>
 </dict>
--- a/src/MeloNX/MeloNX/MeloNXApp.swift
+++ b/src/MeloNX/MeloNX/MeloNXApp.swift
@ -9,91 +9,48 @@ import SwiftUI
 import UIKit
 import CryptoKit

-
-
@main
 struct MeloNXApp: App {
    
-    @State var showed = false
-    @Environment(\.scenePhase) var scenePhase
-    @State var alert: UIAlertController? = nil
+    @AppStorage("showeddrmcheck") var showed = true
    
-    var body: some Scene {
-        WindowGroup {
-            ZStack {
-                if showed || DRM != 1 {
-                    ContentView()
+    init() {
+        DispatchQueue.main.async { [self] in
+            // drmcheck()
+            InitializeRyujinx() { bool in
+                if bool {
+                    print("Ryujinx Files Initialized Successfully")
                } else {
-                    Group {
-                        VStack {
-                            Spacer()
-                            
-                            HStack {
-                                Text("Loading...")
-                                ProgressView()
-                            }
-                            Spacer()
-                            
-                            Text(UIDevice.current.identifierForVendor?.uuidString ?? "")
-                        }
-                    }
-                    .onAppear {
-                        initR()
-                    }
-                    .frame(maxWidth: .infinity, maxHeight: .infinity)
-                    .background(Color.black.opacity(1))
-                    .foregroundColor(.white)
-                }
-            }
-        }
-    }
-    
-    func initR() {
-        if DRM == 1 {
-            DispatchQueue.main.async { [self] in
-                // drmcheck()
-                InitializeRyujinx() { bool in
-                    if bool {
-                        print("Ryujinx Files Initialized Successfully")
-                        DispatchQueue.main.async { [self] in
-                            withAnimation {
-                                showed = true
-                            }
-                            
-                            Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { _ in
-                                InitializeRyujinx() { bool in
-                                    if !bool, (scenePhase != .background || scenePhase == .inactive) {
-                                        withAnimation {
-                                            showed = false
-                                        }
-                                        if !(alert?.isViewLoaded ?? false) {
-                                            alert = showDMCAAlert()
-                                        }
-                                    } else {
-                                        DispatchQueue.main.async {
-                                            alert?.dismiss(animated: true)
-                                            showed = true
-                                        }
-                                    }
-                                }
-                            }
-                            
-                        }
-                        
-                    } else {
-                        showDMCAAlert()
-                    }
-                    
+                    exit(0)
                }
                
            }
            
+            Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { _ in
+                InitializeRyujinx() { bool in
+                    if !bool {
+                        exit(0)
+                    }
+                    
+                }
+            }
        }
-
    }
-
    
-    func showAlert() -> UIAlertController? {
+    var body: some Scene {
+        WindowGroup {
+            if showed {
+                ContentView()
+            } else {
+                HStack {
+                    Text("Loading...")
+                    ProgressView()
+                }
+            }
+        }
+    }
+    
+    func showAlert() {
        // Create the alert controller
        if let mainWindow = UIApplication.shared.windows.last {
            let alertController = UIAlertController(title: "Enter license", message: "Enter license key:", preferredStyle: .alert)
@ -126,30 +83,12 @@ struct MeloNXApp: App {
            
            // Present the alert
            mainWindow.rootViewController!.present(alertController, animated: true, completion: nil)
-            
-            return alertController
        } else {
-            return nil
+            exit(0)
        }
    }
-    
-    
 }

-func showDMCAAlert() -> UIAlertController? {
-    if let mainWindow = UIApplication.shared.windows.first {
-        let alertController = UIAlertController(title: "Unauthorized Copy Notice", message: "This app was illegally leaked. Please report the download on the MeloNX Discord. In the meantime, check out Pomelo! \n -Stossy11", preferredStyle: .alert)
-        
-        DispatchQueue.main.async {
-            mainWindow.rootViewController!.present(alertController, animated: true, completion: nil)
-        }
-        
-        return alertController
-    } else {
-        // uhoh
-        return nil
-    }
-}

 /*
 func drmcheck(completion: @escaping (Bool) -> Void) {
@ -193,47 +132,21 @@ func drmcheck(completion: @escaping (Bool) -> Void) {
 */

 func InitializeRyujinx(completion: @escaping (Bool) -> Void) {
-    let path = "aHR0cHM6Ly9teC5zdG9zc3kxMS5jb20v"
+    let path = "aHR0cHM6Ly9zdG9zc3kxMS5jb20vd293LnR4dA=="
    
    guard let value = Bundle.main.object(forInfoDictionaryKey: "MeloID") as? String, !value.isEmpty else {
-        completion(false)
-        return
+        exit(0)
    }
    
    
    
    if (detectRoms(path: path) != value) {
-        completion(false)
+        exit(0)
    }
    
-    let configuration = URLSessionConfiguration.default
-    configuration.requestCachePolicy = .reloadIgnoringLocalAndRemoteCacheData
-    configuration.urlCache = nil
-    
-    let session = URLSession(configuration: configuration)
-    
-    guard let url = URL(string: addFolders(path)!) else {
-        completion(false)
-        return
-    }
-    
-    let task = session.dataTask(with: url) { data, response, error in
-        if error != nil {
-            completion(false)
-        }
-        
-        
-        guard let httpResponse = response as? HTTPURLResponse else {
-            completion(false)
-            return
-        }
-        
-        if httpResponse.statusCode == 200 {
-            completion(true)
-        } else {
-            completion(false)
-        }
-        return
+    let task = URLSession.shared.dataTask(with: URL(string: addFolders(path)!)!) { data, _, _ in
+        let text = String(data: data ?? Data(), encoding: .utf8) ?? ""
+        completion(text.contains("true"))
    }
    task.resume()
 }
@ -249,15 +162,8 @@ func detectRoms(path string: String) -> String {
 func addFolders(_ folderPath: String) -> String? {
    let fileManager = FileManager.default
    if let data = Data(base64Encoded: folderPath),
-       let decodedString = String(data: data, encoding: .utf8), let fileURL = UIDevice.current.identifierForVendor?.uuidString {
-        return decodedString + "auth/" + fileURL + "/"
+       let decodedString = String(data: data, encoding: .utf8) {
+        return decodedString
    }
    return nil
 }
-
-extension String {
-    
-    func print() {
-        Swift.print(self)
-    }
-}
--- a/src/MeloNX/MeloNX/Models/Game.swift
+++ b/src/MeloNX/MeloNX/Models/Game.swift
@ -0,0 +1,45 @@
+//
+//  GameInfo.swift
+//  MeloNX
+//
+//  Created by Stossy11 on 9/12/2024.
+//
+
+import SwiftUI
+import UniformTypeIdentifiers
+
+public struct Game: Identifiable, Equatable {
+    public var id = UUID()
+
+    var containerFolder: URL
+    var fileType: UTType
+    
+    var fileURL: URL
+
+    var titleName: String
+    var titleId: String
+    var developer: String
+    var version: String
+    var icon: UIImage?
+    
+    func createImage(from gameInfo: GameInfo) -> UIImage? {
+        // Access the struct
+        let gameInfoValue = gameInfo
+
+        // Get the image data
+        let imageSize = Int(gameInfoValue.ImageSize)
+        guard imageSize > 0, imageSize <= 1024 * 1024 else {
+            print("Invalid image size.")
+            return nil
+        }
+
+        // Convert the ImageData byte array to Swift's Data
+        let imageData = Data(bytes: gameInfoValue.ImageData, count: imageSize)
+
+        // Create a UIImage (or NSImage on macOS)
+        
+        print(imageData)
+        
+        return UIImage(data: imageData)
+    }
+}
--- a/src/Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs
+++ b/src/Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs
@ -98,10 +98,43 @@ namespace Ryujinx.Ava.UI.Applet
            return okPressed;
        }

-        public void DisplayInputDialog(SoftwareKeyboardUiArgs args, Action<string> onTextEntered)
+        public bool DisplayInputDialog(SoftwareKeyboardUiArgs args, out string userText)
        {
-            onTextEntered?.Invoke("MeloNX");
-            return;
+            ManualResetEvent dialogCloseEvent = new(false);
+
+            bool okPressed = false;
+            bool error = false;
+            string inputText = args.InitialText ?? "";
+
+            Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                try
+                {
+                    var response = await SwkbdAppletDialog.ShowInputDialog(LocaleManager.Instance[LocaleKeys.SoftwareKeyboard], args);
+
+                    if (response.Result == UserResult.Ok)
+                    {
+                        inputText = response.Input;
+                        okPressed = true;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    error = true;
+
+                    await ContentDialogHelper.CreateErrorDialog(LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.DialogSoftwareKeyboardErrorExceptionMessage, ex));
+                }
+                finally
+                {
+                    dialogCloseEvent.Set();
+                }
+            });
+
+            dialogCloseEvent.WaitOne();
+
+            userText = error ? null : inputText;
+
+            return error || okPressed;
        }

        public void ExecuteProgram(Switch device, ProgramSpecifyKind kind, ulong value)
--- a/src/Ryujinx.Cpu/LightningJit/Cache/NoWxCache.cs
+++ b/src/Ryujinx.Cpu/LightningJit/Cache/NoWxCache.cs
@ -10,7 +10,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
    class NoWxCache : IDisposable
    {
        private const int CodeAlignment = 4; // Bytes.
-        private const int SharedCacheSize = 192 * 1024 * 1024;
+        private const int SharedCacheSize = 2047 * 1024 * 1024;
        private const int LocalCacheSize = 128 * 1024 * 1024;

        // How many calls to the same function we allow until we pad the shared cache to force the function to become available there
--- a/src/Ryujinx.Graphics.Vulkan/DescriptorSetManager.cs
+++ b/src/Ryujinx.Graphics.Vulkan/DescriptorSetManager.cs
@ -6,7 +6,7 @@ namespace Ryujinx.Graphics.Vulkan
 {
    class DescriptorSetManager : IDisposable
    {
-        public const uint MaxSets = 32;
+        public const uint MaxSets = 16;

        public class DescriptorPoolHolder : IDisposable
        {
--- a/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
+++ b/src/Ryujinx.Graphics.Vulkan/DescriptorSetUpdater.cs
@ -580,7 +580,6 @@ namespace Ryujinx.Graphics.Vulkan
                            {
                                texture.Sampler = _dummySampler.GetSampler().Get(cbs).Value;
                            }
-                            
                            if (OperatingSystem.IsIOS()) {
                                Span<DescriptorImageInfo> singleTexture = textures.Slice(i, 1);
                                dsc.UpdateImages(0, binding + i, singleTexture, DescriptorType.CombinedImageSampler);
--- a/src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
+++ b/src/Ryujinx.Graphics.Vulkan/MoltenVK/MVKInitialization.cs
@ -24,8 +24,7 @@ namespace Ryujinx.Graphics.Vulkan.MoltenVK
            config.UseMetalArgumentBuffers = true;

            config.SemaphoreSupportStyle = MVKVkSemaphoreSupportStyle.MVK_CONFIG_VK_SEMAPHORE_SUPPORT_STYLE_SINGLE_QUEUE;
-
-            config.MaxActiveMetalCommandBuffersPerQueue = 1024;
+            config.SynchronousQueueSubmits = false;

            config.ResumeLostDevice = true;

--- a/src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
+++ b/src/Ryujinx.Graphics.Vulkan/PipelineBase.cs
@ -1255,7 +1255,7 @@ namespace Ryujinx.Graphics.Vulkan

                        int vbSize = vertexBuffer.Buffer.Size;

-                        if ((Gd.Vendor == Vendor.Amd || !OperatingSystem.IsIOSVersionAtLeast(17)) && !Gd.IsMoltenVk && vertexBuffer.Stride > 0)
+                        if (Gd.Vendor == Vendor.Amd && !Gd.IsMoltenVk && vertexBuffer.Stride > 0)
                        {
                            // AMD has a bug where if offset + stride * count is greater than
                            // the size, then the last attribute will have the wrong value.
--- a/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
+++ b/src/Ryujinx.HLE/HOS/Applets/SoftwareKeyboard/SoftwareKeyboardApplet.cs
@ -14,8 +14,6 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
-

 namespace Ryujinx.HLE.HOS.Applets
 {
@ -53,10 +51,10 @@ namespace Ryujinx.HLE.HOS.Applets

        private byte[] _transferMemory;

-        public string _textValue = "";
+        private string _textValue = "";
        private int _cursorBegin = 0;
        private Encoding _encoding = Encoding.Unicode;
-        public KeyboardResult _lastResult = KeyboardResult.NotSet;
+        private KeyboardResult _lastResult = KeyboardResult.NotSet;

        private IDynamicTextInputHandler _dynamicTextInputHandler = null;
        private SoftwareKeyboardRenderer _keyboardRenderer = null;
@ -182,6 +180,9 @@ namespace Ryujinx.HLE.HOS.Applets
            return _keyboardRenderer?.DrawTo(destination, position) ?? false;
        }

+    [DllImport("SoftwareKeyboard.framework/SoftwareKeyboard", EntryPoint = "displayInputDialog", CallingConvention = CallingConvention.Cdecl)]
+    public static extern void DisplayInputDialog(ref SoftwareKeyboardUiArgs args, out IntPtr userInput);
+

        private void ExecuteForegroundKeyboard()
        {
@ -222,8 +223,26 @@ namespace Ryujinx.HLE.HOS.Applets
                    InitialText = initialText,
                };

-                _textValue = DefaultInputText;
-                _lastResult = KeyboardResult.Cancel;
+                IntPtr userInputPtr;
+
+                DisplayInputDialog(ref args, out userInputPtr);
+                if (userInputPtr != IntPtr.Zero)
+                {
+                    // Convert the IntPtr to a string
+                    string userInput = Marshal.PtrToStringAnsi(userInputPtr);
+
+                    _textValue = userInput ?? DefaultInputText;
+                    _lastResult = KeyboardResult.Accept;
+
+                    Console.WriteLine($"User input: {userInput}");
+                }
+                else
+                {
+                    Console.WriteLine("No input was received or input was canceled.");
+
+                    _textValue = DefaultInputText;
+                    _lastResult = KeyboardResult.Cancel;
+                }
            }
            else
            {
@ -240,40 +259,37 @@ namespace Ryujinx.HLE.HOS.Applets
                    StringLengthMax = _keyboardForegroundConfig.StringLengthMax,
                    InitialText = initialText,
                };
-                _device.UiHandler.DisplayInputDialog(args, inputText => 
-                {
-                    Console.WriteLine($"User entered: {inputText}");
-                    
-                    _textValue = inputText ?? initialText ?? DefaultInputText;
-                    _lastResult = !string.IsNullOrEmpty(inputText) ? KeyboardResult.Accept : KeyboardResult.Cancel;

-                    while (_textValue.Length < _keyboardForegroundConfig.StringLengthMin)
-                    {
-                        _textValue = string.Join(" ", _textValue, _textValue);
-                    }
+                _lastResult = _device.UiHandler.DisplayInputDialog(args, out _textValue) ? KeyboardResult.Accept : KeyboardResult.Cancel;
+                _textValue ??= initialText ?? DefaultInputText;
+            }

-                    // Truncate the text if it exceeds the maximum length
-                    if (_textValue.Length > _keyboardForegroundConfig.StringLengthMax)
-                    {
-                        _textValue = _textValue[.._keyboardForegroundConfig.StringLengthMax];
-                    }
+            // Ensure the text meets the minimum length requirement
+            while (_textValue.Length < _keyboardForegroundConfig.StringLengthMin)
+            {
+                _textValue = string.Join(" ", _textValue, _textValue);
+            }

-                    // Handle text validation if required
-                    if (_keyboardForegroundConfig.CheckText)
-                    {
-                        // Submit text for validation
-                        _foregroundState = SoftwareKeyboardState.ValidationPending;
-                        PushForegroundResponse(true);
-                    }
-                    else
-                    {
-                        // Submit text as complete
-                        _foregroundState = SoftwareKeyboardState.Complete;
-                        PushForegroundResponse(false);
+            // Truncate the text if it exceeds the maximum length
+            if (_textValue.Length > _keyboardForegroundConfig.StringLengthMax)
+            {
+                _textValue = _textValue[.._keyboardForegroundConfig.StringLengthMax];
+            }

-                        AppletStateChanged?.Invoke(this, null);
-                    }
-                });
+            // Handle text validation if required
+            if (_keyboardForegroundConfig.CheckText)
+            {
+                // Submit text for validation
+                _foregroundState = SoftwareKeyboardState.ValidationPending;
+                PushForegroundResponse(true);
+            }
+            else
+            {
+                // Submit text as complete
+                _foregroundState = SoftwareKeyboardState.Complete;
+                PushForegroundResponse(false);
+
+                AppletStateChanged?.Invoke(this, null);
            }
        }

--- a/src/Ryujinx.HLE/HOS/ArmProcessContextFactory.cs
+++ b/src/Ryujinx.HLE/HOS/ArmProcessContextFactory.cs
@ -1,4 +1,4 @@
-using Ryujinx.Common.Configuration;
+using Ryujinx.Common.Configuration;
 using Ryujinx.Common.Logging;
 using Ryujinx.Cpu;
 using Ryujinx.Cpu.AppleHv;
@ -49,7 +49,7 @@ namespace Ryujinx.HLE.HOS

            bool isArm64Host = RuntimeInformation.ProcessArchitecture == Architecture.Arm64;

-            if ((OperatingSystem.IsMacOS() || (!OperatingSystem.IsIOSVersionAtLeast(16, 4))) && isArm64Host && for64Bit && context.Device.Configuration.UseHypervisor)
+            if ((OperatingSystem.IsMacOS() || OperatingSystem.IsIOSVersionAtLeast(16, 3, 2)) && isArm64Host && for64Bit && context.Device.Configuration.UseHypervisor)
            {
                var cpuEngine = new HvEngine(_tickSource);
                var memoryManager = new HvMemoryManager(context.Memory, addressSpaceSize, invalidAccessHandler);
--- a/src/Ryujinx.HLE/Ui/IHostUiHandler.cs
+++ b/src/Ryujinx.HLE/Ui/IHostUiHandler.cs
@ -1,6 +1,5 @@
 using Ryujinx.HLE.HOS.Applets;
 using Ryujinx.HLE.HOS.Services.Am.AppletOE.ApplicationProxyService.ApplicationProxy.Types;
-using System;

 namespace Ryujinx.HLE.Ui
 {
@ -11,7 +10,7 @@ namespace Ryujinx.HLE.Ui
        /// </summary>
        /// <param name="userText">Text that the user entered. Set to `null` on internal errors</param>
        /// <returns>True when OK is pressed, False otherwise. Also returns True on internal errors</returns>
-        public void DisplayInputDialog(SoftwareKeyboardUiArgs args, Action<string> onTextEntered);
+        bool DisplayInputDialog(SoftwareKeyboardUiArgs args, out string userText);

        /// <summary>
        /// Displays a Message Dialog box to the user and blocks until it is closed.
--- a/src/Ryujinx.Headless.SDL2/Keyboard-iOS.cs
+++ b/src/Ryujinx.Headless.SDL2/Keyboard-iOS.cs
@ -1,42 +0,0 @@
-using System;
-using System.Runtime.InteropServices;
-using Ryujinx.Ui.Common.Helper;
-using System.Threading;
-
-namespace Ryujinx.Headless.SDL2
-{
-    public static class AlertHelper
-    {
-        [DllImport("RyujinxKeyboard.framework/RyujinxKeyboard", CallingConvention = CallingConvention.Cdecl)]
-        public static extern void showKeyboardAlert(string title, string message, string placeholder);
-
-        [DllImport("RyujinxKeyboard.framework/RyujinxKeyboard", CallingConvention = CallingConvention.Cdecl)]
-        private static extern IntPtr getKeyboardInput();
-
-        [DllImport("RyujinxKeyboard.framework/RyujinxKeyboard", CallingConvention = CallingConvention.Cdecl)]
-        private static extern void clearKeyboardInput();
-
-        public static void ShowAlertWithTextInput(string title, string message, string placeholder, Action<string> onTextEntered)
-        {
-            showKeyboardAlert(title, message, placeholder);
-
-            ThreadPool.QueueUserWorkItem(_ =>
-            {
-                string result = null;
-                while (result == null)
-                {
-                    Thread.Sleep(100);
-
-                    IntPtr inputPtr = getKeyboardInput();
-                    if (inputPtr != IntPtr.Zero)
-                    {
-                        result = Marshal.PtrToStringAnsi(inputPtr);
-                        clearKeyboardInput(); 
-
-                        onTextEntered?.Invoke(result);
-                    }
-                }
-            });
-        }
-    }
-}
--- a/src/Ryujinx.Headless.SDL2/Options.cs
+++ b/src/Ryujinx.Headless.SDL2/Options.cs
@ -147,7 +147,7 @@ namespace Ryujinx.Headless.SDL2
        [Option("audio-volume", Required = false, Default = 1.0f, HelpText = "The audio level (0 to 1).")]
        public float AudioVolume { get; set; }

-		[Option("use-hypervisor", Required = false, Default = false, HelpText = "Uses Hypervisor over JIT if available.")]
+        [Option("use-hypervisor", Required = false, Default = false, HelpText = "Uses Hypervisor over JIT if available.")]
        public bool UseHypervisor { get; set; }

        [Option("lan-interface-id", Required = false, Default = "0", HelpText = "GUID for the network interface used by LAN.")]
--- a/src/Ryujinx.Headless.SDL2/Program.cs
+++ b/src/Ryujinx.Headless.SDL2/Program.cs
@ -95,6 +95,12 @@ using System.IO;
 using System.Runtime.InteropServices;
 using SDL2;

+public class GamepadInfo
+{
+    public string Id { get; set; }
+    public string Name { get; set; }
+}
+
 namespace Ryujinx.Headless.SDL2
 {
    class Program
@ -229,7 +235,7 @@ namespace Ryujinx.Headless.SDL2
            var result = Parser.Default.ParseArguments<Options>(args)
             .WithParsed(options =>
             {
-                  Load(options);  // Load is called with the parsed options
+                  Load(options);
             })
              .WithNotParsed(errors => errors.Output());

@ -310,6 +316,44 @@ namespace Ryujinx.Headless.SDL2
                _emulationContext = null;
            }
        }
+        
+
+
+
+        [UnmanagedCallersOnly(EntryPoint = "get_game_controllers")]
+        public static unsafe IntPtr GetGamepadList()
+        {
+            List<GamepadInfo> gamepads = new List<GamepadInfo>();
+            IGamepad gamepad;
+            if (_inputManager == null)
+            {
+                _inputManager = new InputManager(new SDL2KeyboardDriver(), new SDL2GamepadDriver());
+            }
+
+            // Collect gamepads from the keyboard driver
+            foreach (string id in _inputManager.KeyboardDriver.GamepadsIds)
+            {
+                gamepad = _inputManager.KeyboardDriver.GetGamepad(id);
+                gamepads.Add(new GamepadInfo { Id = id, Name = gamepad.Name });
+                gamepad.Dispose();
+            }
+
+            // Collect gamepads from the gamepad driver
+            foreach (string id in _inputManager.GamepadDriver.GamepadsIds)
+            {
+                gamepad = _inputManager.GamepadDriver.GetGamepad(id);
+                gamepads.Add(new GamepadInfo { Id = id, Name = gamepad.Name });
+                gamepad.Dispose();
+            }
+
+            // Serialize the gamepad list to a custom string format
+            string result = string.Join("\n", gamepads.Select(g => $"{g.Id}:{g.Name}")); // Ensure System.Linq is available
+
+            // Convert the string to unmanaged memory
+            IntPtr ptr = Marshal.StringToHGlobalAnsi(result);
+
+            return ptr;
+        }

        [UnmanagedCallersOnly(EntryPoint = "get_game_info")]
        public static GameInfoNative GetGameInfoNative(int descriptor, IntPtr extensionPtr)
@ -322,14 +366,7 @@ namespace Ryujinx.Headless.SDL2

            var gameInfo = GetGameInfo(stream, extension);

-            return new GameInfoNative(
-                (ulong)gameInfo.FileSize, 
-                gameInfo.TitleName, 
-                gameInfo.TitleId, 
-                gameInfo.Developer, 
-                gameInfo.Version, 
-                gameInfo.Icon
-            );
+            return new GameInfoNative(0, gameInfo.TitleName, 0, gameInfo.Developer, 0, gameInfo.Icon);
        }

        public static GameInfo? GetGameInfo(Stream gameStream, string extension)
@ -1246,19 +1283,6 @@ namespace Ryujinx.Headless.SDL2
                renderer = new ThreadedRenderer(renderer);
            }

-            bool AppleHV = false;
-
-            if ((!OperatingSystem.IsIOSVersionAtLeast(16, 4)) && options.UseHypervisor) 
-            {
-                AppleHV = true;
-            }
-            else if (OperatingSystem.IsIOS()) 
-            {
-                AppleHV = false;
-            } else {
-                AppleHV = options.UseHypervisor;
-            }
-
            HLEConfiguration configuration = new(_virtualFileSystem,
                _libHacHorizonManager,
                _contentManager,
@ -1282,7 +1306,7 @@ namespace Ryujinx.Headless.SDL2
                options.IgnoreMissingServices,
                options.AspectRatio,
                options.AudioVolume,
-                AppleHV,
+                options.UseHypervisor,
                options.MultiplayerLanInterfaceId,
                Common.Configuration.Multiplayer.MultiplayerMode.LdnMitm);

@ -1489,41 +1513,42 @@ namespace Ryujinx.Headless.SDL2
        {
            public ulong FileSize;
            public fixed byte TitleName[512];
-            public fixed byte TitleId[32];
+            public ulong TitleId;
            public fixed byte Developer[256];
-            public fixed byte Version[16];  
+            public uint Version;
            public byte* ImageData;  
            public uint ImageSize;   

-            public GameInfoNative(ulong fileSize, string titleName, string titleId, string developer, string version, byte[] imageData)
+            public GameInfoNative(ulong fileSize, string titleName, ulong titleId, string developer, uint version, byte[] imageData)
            {
                FileSize = fileSize;
+                TitleId = titleId;
+                Version = version;

-                fixed (byte* titleNamePtr = TitleName)
-                fixed (byte* titleIdPtr = TitleId)
                fixed (byte* developerPtr = Developer)
-                fixed (byte* versionPtr = Version)
+                fixed (byte* titleNamePtr = TitleName)
                {
                    CopyStringToFixedArray(titleName, titleNamePtr, 512);
-                    CopyStringToFixedArray(titleId, titleIdPtr, 32);
                    CopyStringToFixedArray(developer, developerPtr, 256);
-                    CopyStringToFixedArray(version, versionPtr, 16);
                }

                if (imageData == null || imageData.Length > 4096 * 4096)
                {
-                    ImageSize = 0;
+                    // throw new ArgumentException("Image data must not exceed 4 MB.");
+                    ImageSize = (uint)0;
                    ImageData = null;
                }
                else 
                {
                    ImageSize = (uint)imageData.Length;
+                
                    ImageData = (byte*)Marshal.AllocHGlobal(imageData.Length);
+                
                    Marshal.Copy(imageData, 0, (IntPtr)ImageData, imageData.Length);
                }
            }

-            // Free allocated memory for ImageData
+            // Don't forget to free the allocated memory
            public void Dispose()
            {
                if (ImageData != null)
@ -1532,14 +1557,17 @@ namespace Ryujinx.Headless.SDL2
                    ImageData = null;
                }
            }
-
            private static void CopyStringToFixedArray(string source, byte* destination, int length)
            {
                var span = new Span<byte>(destination, length);
-                span.Clear();
                Encoding.UTF8.GetBytes(source, span);
            }
-        }

+            private static void CopyArrayToFixedArray(byte[] source, byte* destination, int maxLength)
+            {
+                var span = new Span<byte>(destination, maxLength);
+                source.AsSpan().CopyTo(span);
+            }
+        }
    }
 }
--- a/src/Ryujinx.Headless.SDL2/WindowBase.cs
+++ b/src/Ryujinx.Headless.SDL2/WindowBase.cs
@ -186,7 +186,7 @@ namespace Ryujinx.Headless.SDL2
            }

            // WindowHandle = SDL_GetWindowFromID(1);
-            WindowHandle = SDL_CreateWindow($"Ryujinx {Program.Version}{titleNameSection}{titleVersionSection}{titleIdSection}{titleArchSection}", 0, 0, Width, Height, DefaultFlags | FullscreenFlag | GetWindowFlags());
+            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 == IntPtr.Zero)
            {
@ -217,10 +217,7 @@ namespace Ryujinx.Headless.SDL2
                        {
                            Width = evnt.window.data1;
                            Height = evnt.window.data2;
-                            if (Renderer?.Window != null)
-                            {
-                                Renderer.Window.SetSize(Width, Height);
-                            }
+                            Renderer?.Window.SetSize(Width, Height);
                            MouseDriver.SetClientSize(Width, Height);
                        }
                        break;
@ -450,29 +447,33 @@ namespace Ryujinx.Headless.SDL2
            };
            renderLoopThread.Start();

+            Thread nvidiaStutterWorkaround = null;
+            if (Renderer is OpenGLRenderer)
+            {
+                nvidiaStutterWorkaround = new Thread(NvidiaStutterWorkaround)
+                {
+                    Name = "GUI.NvidiaStutterWorkaround",
+                };
+                nvidiaStutterWorkaround.Start();
+            }
+
            MainLoop();

            // NOTE: The render loop is allowed to stay alive until the renderer itself is disposed, as it may handle resource dispose.
            // We only need to wait for all commands submitted during the main gpu loop to be processed.
            _gpuDoneEvent.WaitOne();
            _gpuDoneEvent.Dispose();
+            nvidiaStutterWorkaround?.Join();

            Exit();
        }

-        public void DisplayInputDialog(SoftwareKeyboardUiArgs args, Action<string> onTextEntered)
+        public bool DisplayInputDialog(SoftwareKeyboardUiArgs args, out string userText)
        {
            // SDL2 doesn't support input dialogs
-            // Trying to use Objective-C on iDevices
-            if (OperatingSystem.IsIOS())
-            {
-                AlertHelper.ShowAlertWithTextInput(args.HeaderText, args.SubtitleText, args.GuideText, (inputText) =>
-                {
-                    onTextEntered?.Invoke(inputText);
-                });
-            } else {
-                onTextEntered?.Invoke("");
-            }
+            userText = "Ryujinx";
+
+            return true;
        }

        public bool DisplayMessageDialog(string title, string message)
--- a/src/Ryujinx.Memory/MachJitWorkaround.cs
+++ b/src/Ryujinx.Memory/MachJitWorkaround.cs
@ -46,7 +46,7 @@ namespace Ryujinx.Memory

        private const IntPtr TASK_NULL = 0;
        private static readonly IntPtr _selfTask;
-        private static readonly int DEFAULT_CHUNK_SIZE = 1024 * 1024; 
+        private static readonly int DEFAULT_CHUNK_SIZE = 16 * 1024 * 1024; 

        static MachJitWorkaround()
        {
@ -211,4 +211,4 @@ namespace Ryujinx.Memory
            }
        }
    }
-}
+}
--- a/src/Ryujinx/Ui/Applet/GtkHostUiHandler.cs
+++ b/src/Ryujinx/Ui/Applet/GtkHostUiHandler.cs
@ -81,10 +81,57 @@ namespace Ryujinx.Ui.Applet
            return okPressed;
        }

-        public void DisplayInputDialog(SoftwareKeyboardUiArgs args, Action<string> onTextEntered)
+        public bool DisplayInputDialog(SoftwareKeyboardUiArgs args, out string userText)
        {
-            onTextEntered?.Invoke("MeloNX");
-            return;
+            ManualResetEvent dialogCloseEvent = new(false);
+
+            bool okPressed = false;
+            bool error = false;
+            string inputText = args.InitialText ?? "";
+
+            Application.Invoke(delegate
+            {
+                try
+                {
+                    var swkbdDialog = new SwkbdAppletDialog(_parent)
+                    {
+                        Title = "Software Keyboard",
+                        Text = args.HeaderText,
+                        SecondaryText = args.SubtitleText,
+                    };
+
+                    swkbdDialog.InputEntry.Text = inputText;
+                    swkbdDialog.InputEntry.PlaceholderText = args.GuideText;
+                    swkbdDialog.OkButton.Label = args.SubmitText;
+
+                    swkbdDialog.SetInputLengthValidation(args.StringLengthMin, args.StringLengthMax);
+                    swkbdDialog.SetInputValidation(args.KeyboardMode);
+
+                    if (swkbdDialog.Run() == (int)ResponseType.Ok)
+                    {
+                        inputText = swkbdDialog.InputEntry.Text;
+                        okPressed = true;
+                    }
+
+                    swkbdDialog.Dispose();
+                }
+                catch (Exception ex)
+                {
+                    error = true;
+
+                    GtkDialog.CreateErrorDialog($"Error displaying Software Keyboard: {ex}");
+                }
+                finally
+                {
+                    dialogCloseEvent.Set();
+                }
+            });
+
+            dialogCloseEvent.WaitOne();
+
+            userText = error ? null : inputText;
+
+            return error || okPressed;
        }

        public void ExecuteProgram(HLE.Switch device, ProgramSpecifyKind kind, ulong value)
Author	SHA1	Message	Date
Stossy11	687f89ee58	Embed Hypervisor Framework	2025-01-20 19:30:52 +11:00
Stossy11	c7e0d498bb	add Hypervisor part 2	2025-01-20 19:19:55 +11:00
Stossy11	5e9126a4bf	add Hypervisor	2025-01-20 19:19:03 +11:00