diff --git a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj
index 58de94918..ca1bdcc1a 100644
--- a/src/MeloNX/MeloNX.xcodeproj/project.pbxproj
+++ b/src/MeloNX/MeloNX.xcodeproj/project.pbxproj
@@ -770,6 +770,9 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(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 = z;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1001,6 +1004,10 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 				);
 				MARKETING_VERSION = "$(VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX;
@@ -1141,6 +1148,9 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(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 = z;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1372,6 +1382,10 @@
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
+					"$(PROJECT_DIR)/MeloNX/Dependencies/Dynamic\\ Libraries",
 				);
 				MARKETING_VERSION = "$(VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.stossy11.MeloNX;
diff --git a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate
index 63d9d1b9d..cbe6ca733 100644
Binary files a/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate and b/src/MeloNX/MeloNX.xcodeproj/project.xcworkspace/xcuserdata/stossy11.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/NativeController.swift b/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/NativeController.swift
index a1a67d643..e8e7604c9 100644
--- a/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/NativeController.swift
+++ b/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/NativeController.swift
@@ -13,6 +13,8 @@ class NativeController: Hashable, BaseController {
     private var controller: OpaquePointer?
     private var nativeController: GCController
     private var controllerMotionProvider: ControllerMotionProvider?
+    private var deviceMotionProvider: DeviceMotionProvider?
+    
     private let controllerHaptics: CHHapticEngine?
     private let rumbleController: RumbleController?
 
@@ -48,14 +50,25 @@ class NativeController: Hashable, BaseController {
         // Setup Motion
         let dsuServer = DSUServer.shared
         
-        controllerMotionProvider = ControllerMotionProvider(controller: nativeController, slot: slot)
-        if let provider = controllerMotionProvider {
-            dsuServer.register(provider)
+        if nativeController.vendorName == "Joy-Con (l/R)" {
+            deviceMotionProvider = DeviceMotionProvider(slot: slot)
+            if let provider = deviceMotionProvider {
+                dsuServer.register(provider)
+            }
+        } else {
+            controllerMotionProvider = ControllerMotionProvider(controller: nativeController, slot: slot)
+            if let provider = controllerMotionProvider {
+                dsuServer.register(provider)
+            }
         }
     }
     
     internal func tryGetMotionProvider() -> DSUMotionProvider? {
-        return controllerMotionProvider
+        if nativeController.vendorName == "Joy-Con (l/R)" {
+            return deviceMotionProvider
+        } else {
+            return controllerMotionProvider
+        }
     }
 
     private func setupHandheldController() {
diff --git a/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/Rumble/RumbleController.swift b/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/Rumble/RumbleController.swift
index d6718fce1..2f7793af7 100644
--- a/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/Rumble/RumbleController.swift
+++ b/src/MeloNX/MeloNX/App/Core/Ryujinx/Controller/Rumble/RumbleController.swift
@@ -17,7 +17,7 @@ class RumbleController {
     
     // The duration of each continuous haptic event.
     // We'll restart the players before this duration expires.
-    private let hapticEventDuration: TimeInterval = 7200
+    private let hapticEventDuration: TimeInterval = 20
     
     // Timer to schedule player restarts
     private var playerRestartTimer: Timer?