diff --git a/developer_toolbox/build_retrodck_locally.sh b/developer_toolbox/build_retrodeck_locally.sh
similarity index 100%
rename from developer_toolbox/build_retrodck_locally.sh
rename to developer_toolbox/build_retrodeck_locally.sh
diff --git a/emu-configs/PCSX2/PCSX2.ini b/emu-configs/PCSX2/PCSX2.ini
index a1fe4f9d..c818b225 100644
--- a/emu-configs/PCSX2/PCSX2.ini
+++ b/emu-configs/PCSX2/PCSX2.ini
@@ -7,7 +7,7 @@ PauseOnFocusLoss = true
 StartFullscreen = true
 StartPaused = false
 ConfirmShutdown = false
-HideMouseCursor = false
+HideMouseCursor = true
 RenderToSeparateWindow = false
 HideMainWindowWhenRunning = false
 DisableWindowResize = false
diff --git a/emu-configs/ryujinx/Config.json b/emu-configs/ryujinx/Config.json
index 5eac5602..4f67672d 100644
--- a/emu-configs/ryujinx/Config.json
+++ b/emu-configs/ryujinx/Config.json
@@ -91,11 +91,11 @@
   "enable_keyboard": false,
   "enable_mouse": false,
   "hotkeys": {
-    "toggle_vsync": "",
-    "screenshot": "",
-    "show_ui": "ESC",
-    "pause": "",
-    "toggle_mute": "",
+    "toggle_vsync": "Tab",
+    "screenshot": "F8",
+    "show_ui": "F4",
+    "pause": "F5",
+    "toggle_mute": "F2",
     "res_scale_up": "Unbound",
     "res_scale_down": "Unbound",
     "volume_up": "Unbound",
@@ -119,11 +119,11 @@
         "rotate90_cw": false,
         "stick_button": "RightStick"
       },
-      "deadzone_left": 0,
-      "deadzone_right": 0,
-      "range_left": 1.2,
+      "deadzone_left": 0.1,
+      "deadzone_right": 0.1,
+      "range_left": 1,
       "range_right": 1,
-      "trigger_threshold": 0,
+      "trigger_threshold": 0.5,
       "motion": {
         "slot": 0,
         "alt_slot": 0,
@@ -136,12 +136,12 @@
         "enable_motion": true
       },
       "rumble": {
-        "strong_rumble": 2.1,
+        "strong_rumble": 1,
         "weak_rumble": 1,
         "enable_rumble": true
       },
       "left_joycon": {
-        "button_minus": "Minus",
+        "button_minus": "Back",
         "button_l": "LeftShoulder",
         "button_zl": "LeftTrigger",
         "button_sl": "Unbound",
@@ -152,20 +152,20 @@
         "dpad_right": "DpadRight"
       },
       "right_joycon": {
-        "button_plus": "Plus",
+        "button_plus": "Start",
         "button_r": "RightShoulder",
         "button_zr": "RightTrigger",
         "button_sl": "Unbound",
         "button_sr": "Unbound",
-        "button_x": "X",
-        "button_b": "B",
-        "button_y": "Y",
-        "button_a": "A"
+        "button_x": "Y",
+        "button_b": "A",
+        "button_y": "X",
+        "button_a": "B"
       },
       "version": 1,
       "backend": "GamepadSDL2",
-      "id": "0-00000003-28de-0000-ff11-000001000000",
-      "controller_type": "JoyconPair",
+      "id": "0-36b80003-28de-0000-ff11-000001000000",
+      "controller_type": "ProController",
       "player_index": "Player1"
     },
     {
@@ -183,11 +183,11 @@
         "rotate90_cw": false,
         "stick_button": "RightStick"
       },
-      "deadzone_left": 0,
-      "deadzone_right": 0,
-      "range_left": 1.2,
+      "deadzone_left": 0.1,
+      "deadzone_right": 0.1,
+      "range_left": 1,
       "range_right": 1,
-      "trigger_threshold": 0,
+      "trigger_threshold": 0.5,
       "motion": {
         "motion_backend": "GamepadDriver",
         "sensitivity": 100,
@@ -200,7 +200,7 @@
         "enable_rumble": true
       },
       "left_joycon": {
-        "button_minus": "Minus",
+        "button_minus": "Back",
         "button_l": "LeftShoulder",
         "button_zl": "LeftTrigger",
         "button_sl": "Unbound",
@@ -211,19 +211,19 @@
         "dpad_right": "DpadRight"
       },
       "right_joycon": {
-        "button_plus": "Plus",
+        "button_plus": "Start",
         "button_r": "RightShoulder",
         "button_zr": "RightTrigger",
         "button_sl": "Unbound",
         "button_sr": "Unbound",
-        "button_x": "X",
-        "button_b": "B",
-        "button_y": "Y",
-        "button_a": "A"
+        "button_x": "Y",
+        "button_b": "A",
+        "button_y": "X",
+        "button_a": "B"
       },
       "version": 1,
       "backend": "GamepadSDL2",
-      "id": "1-00000003-28de-0000-ff11-000001000000",
+      "id": "1-36b80003-28de-0000-ff11-000001000000",
       "controller_type": "ProController",
       "player_index": "Player2"
     },
@@ -242,11 +242,11 @@
         "rotate90_cw": false,
         "stick_button": "RightStick"
       },
-      "deadzone_left": 0,
-      "deadzone_right": 0,
-      "range_left": 1.2,
+      "deadzone_left": 0.1,
+      "deadzone_right": 0.1,
+      "range_left": 1,
       "range_right": 1,
-      "trigger_threshold": 0,
+      "trigger_threshold": 0.5,
       "motion": {
         "motion_backend": "GamepadDriver",
         "sensitivity": 100,
@@ -259,7 +259,7 @@
         "enable_rumble": true
       },
       "left_joycon": {
-        "button_minus": "Minus",
+        "button_minus": "Back",
         "button_l": "LeftShoulder",
         "button_zl": "LeftTrigger",
         "button_sl": "Unbound",
@@ -270,19 +270,19 @@
         "dpad_right": "DpadRight"
       },
       "right_joycon": {
-        "button_plus": "Plus",
+        "button_plus": "Start",
         "button_r": "RightShoulder",
         "button_zr": "RightTrigger",
         "button_sl": "Unbound",
         "button_sr": "Unbound",
-        "button_x": "X",
-        "button_b": "B",
-        "button_y": "Y",
-        "button_a": "A"
+        "button_x": "Y",
+        "button_b": "A",
+        "button_y": "X",
+        "button_a": "B"
       },
       "version": 1,
       "backend": "GamepadSDL2",
-      "id": "2-00000003-28de-0000-ff11-000001000000",
+      "id": "2-36b80003-28de-0000-ff11-000001000000",
       "controller_type": "ProController",
       "player_index": "Player3"
     },
@@ -301,11 +301,11 @@
         "rotate90_cw": false,
         "stick_button": "RightStick"
       },
-      "deadzone_left": 0,
-      "deadzone_right": 0,
-      "range_left": 1.2,
+      "deadzone_left": 0.1,
+      "deadzone_right": 0.1,
+      "range_left": 1,
       "range_right": 1,
-      "trigger_threshold": 0,
+      "trigger_threshold": 0.5,
       "motion": {
         "motion_backend": "GamepadDriver",
         "sensitivity": 100,
@@ -318,7 +318,7 @@
         "enable_rumble": true
       },
       "left_joycon": {
-        "button_minus": "Minus",
+        "button_minus": "Back",
         "button_l": "LeftShoulder",
         "button_zl": "LeftTrigger",
         "button_sl": "Unbound",
@@ -329,19 +329,19 @@
         "dpad_right": "DpadRight"
       },
       "right_joycon": {
-        "button_plus": "Plus",
+        "button_plus": "Start",
         "button_r": "RightShoulder",
         "button_zr": "RightTrigger",
         "button_sl": "Unbound",
         "button_sr": "Unbound",
-        "button_x": "X",
-        "button_b": "B",
-        "button_y": "Y",
-        "button_a": "A"
+        "button_x": "Y",
+        "button_b": "A",
+        "button_y": "X",
+        "button_a": "B"
       },
       "version": 1,
       "backend": "GamepadSDL2",
-      "id": "3-00000003-28de-0000-ff11-000001000000",
+      "id": "3-36b80003-28de-0000-ff11-000001000000",
       "controller_type": "ProController",
       "player_index": "Player4"
     }
diff --git a/emu-configs/ryujinx/profiles/controller/Controller-P1.json b/emu-configs/ryujinx/profiles/controller/Controller-P1.json
new file mode 100644
index 00000000..99ad926d
--- /dev/null
+++ b/emu-configs/ryujinx/profiles/controller/Controller-P1.json
@@ -0,0 +1,64 @@
+{
+  "left_joycon_stick": {
+    "joystick": "Left",
+    "invert_stick_x": false,
+    "invert_stick_y": false,
+    "rotate90_cw": false,
+    "stick_button": "LeftStick"
+  },
+  "right_joycon_stick": {
+    "joystick": "Right",
+    "invert_stick_x": false,
+    "invert_stick_y": false,
+    "rotate90_cw": false,
+    "stick_button": "RightStick"
+  },
+  "deadzone_left": 0.1,
+  "deadzone_right": 0.1,
+  "range_left": 1,
+  "range_right": 1,
+  "trigger_threshold": 0.5,
+  "motion": {
+    "slot": 0,
+    "alt_slot": 0,
+    "mirror_input": false,
+    "dsu_server_host": "127.0.0.1",
+    "dsu_server_port": 26760,
+    "motion_backend": "CemuHook",
+    "sensitivity": 100,
+    "gyro_deadzone": 1,
+    "enable_motion": false
+  },
+  "rumble": {
+    "strong_rumble": 1,
+    "weak_rumble": 1,
+    "enable_rumble": true
+  },
+  "left_joycon": {
+    "button_minus": "Back",
+    "button_l": "LeftShoulder",
+    "button_zl": "LeftTrigger",
+    "button_sl": "Unbound",
+    "button_sr": "Unbound",
+    "dpad_up": "DpadUp",
+    "dpad_down": "DpadDown",
+    "dpad_left": "DpadLeft",
+    "dpad_right": "DpadRight"
+  },
+  "right_joycon": {
+    "button_plus": "Start",
+    "button_r": "RightShoulder",
+    "button_zr": "RightTrigger",
+    "button_sl": "Unbound",
+    "button_sr": "Unbound",
+    "button_x": "Y",
+    "button_b": "A",
+    "button_y": "X",
+    "button_a": "B"
+  },
+  "version": 1,
+  "backend": "GamepadSDL2",
+  "id": "0-f7390003-28de-0000-ff11-000001000000",
+  "controller_type": "ProController",
+  "player_index": "Player1"
+}
diff --git a/emu-configs/ryujinx/profiles/controller/Controller-P2.json b/emu-configs/ryujinx/profiles/controller/Controller-P2.json
new file mode 100644
index 00000000..30e0a478
--- /dev/null
+++ b/emu-configs/ryujinx/profiles/controller/Controller-P2.json
@@ -0,0 +1,59 @@
+{
+  "left_joycon_stick": {
+    "joystick": "Left",
+    "invert_stick_x": false,
+    "invert_stick_y": false,
+    "rotate90_cw": false,
+    "stick_button": "LeftStick"
+  },
+  "right_joycon_stick": {
+    "joystick": "Right",
+    "invert_stick_x": false,
+    "invert_stick_y": false,
+    "rotate90_cw": false,
+    "stick_button": "RightStick"
+  },
+  "deadzone_left": 0.1,
+  "deadzone_right": 0.1,
+  "range_left": 1,
+  "range_right": 1,
+  "trigger_threshold": 0.5,
+  "motion": {
+    "motion_backend": "GamepadDriver",
+    "sensitivity": 100,
+    "gyro_deadzone": 1,
+    "enable_motion": false
+  },
+  "rumble": {
+    "strong_rumble": 1,
+    "weak_rumble": 1,
+    "enable_rumble": true
+  },
+  "left_joycon": {
+    "button_minus": "Back",
+    "button_l": "LeftShoulder",
+    "button_zl": "LeftTrigger",
+    "button_sl": "Unbound",
+    "button_sr": "Unbound",
+    "dpad_up": "DpadUp",
+    "dpad_down": "DpadDown",
+    "dpad_left": "DpadLeft",
+    "dpad_right": "DpadRight"
+  },
+  "right_joycon": {
+    "button_plus": "Start",
+    "button_r": "RightShoulder",
+    "button_zr": "RightTrigger",
+    "button_sl": "Unbound",
+    "button_sr": "Unbound",
+    "button_x": "Y",
+    "button_b": "A",
+    "button_y": "X",
+    "button_a": "B"
+  },
+  "version": 1,
+  "backend": "GamepadSDL2",
+  "id": "1-f7390003-28de-0000-ff11-000001000000",
+  "controller_type": "ProController",
+  "player_index": "Player2"
+}
diff --git a/emu-configs/ryujinx/profiles/controller/Controller-P3.json b/emu-configs/ryujinx/profiles/controller/Controller-P3.json
new file mode 100644
index 00000000..e2b180be
--- /dev/null
+++ b/emu-configs/ryujinx/profiles/controller/Controller-P3.json
@@ -0,0 +1,59 @@
+{
+  "left_joycon_stick": {
+    "joystick": "Left",
+    "invert_stick_x": false,
+    "invert_stick_y": false,
+    "rotate90_cw": false,
+    "stick_button": "LeftStick"
+  },
+  "right_joycon_stick": {
+    "joystick": "Right",
+    "invert_stick_x": false,
+    "invert_stick_y": false,
+    "rotate90_cw": false,
+    "stick_button": "RightStick"
+  },
+  "deadzone_left": 0.1,
+  "deadzone_right": 0.1,
+  "range_left": 1,
+  "range_right": 1,
+  "trigger_threshold": 0.5,
+  "motion": {
+    "motion_backend": "GamepadDriver",
+    "sensitivity": 100,
+    "gyro_deadzone": 1,
+    "enable_motion": false
+  },
+  "rumble": {
+    "strong_rumble": 1,
+    "weak_rumble": 1,
+    "enable_rumble": true
+  },
+  "left_joycon": {
+    "button_minus": "Back",
+    "button_l": "LeftShoulder",
+    "button_zl": "LeftTrigger",
+    "button_sl": "Unbound",
+    "button_sr": "Unbound",
+    "dpad_up": "DpadUp",
+    "dpad_down": "DpadDown",
+    "dpad_left": "DpadLeft",
+    "dpad_right": "DpadRight"
+  },
+  "right_joycon": {
+    "button_plus": "Start",
+    "button_r": "RightShoulder",
+    "button_zr": "RightTrigger",
+    "button_sl": "Unbound",
+    "button_sr": "Unbound",
+    "button_x": "Y",
+    "button_b": "A",
+    "button_y": "X",
+    "button_a": "B"
+  },
+  "version": 1,
+  "backend": "GamepadSDL2",
+  "id": "2-f7390003-28de-0000-ff11-000001000000",
+  "controller_type": "ProController",
+  "player_index": "Player3"
+}
diff --git a/emu-configs/ryujinx/profiles/controller/Controller-P4.json b/emu-configs/ryujinx/profiles/controller/Controller-P4.json
new file mode 100644
index 00000000..27df16f0
--- /dev/null
+++ b/emu-configs/ryujinx/profiles/controller/Controller-P4.json
@@ -0,0 +1,59 @@
+{
+  "left_joycon_stick": {
+    "joystick": "Left",
+    "invert_stick_x": false,
+    "invert_stick_y": false,
+    "rotate90_cw": false,
+    "stick_button": "LeftStick"
+  },
+  "right_joycon_stick": {
+    "joystick": "Right",
+    "invert_stick_x": false,
+    "invert_stick_y": false,
+    "rotate90_cw": false,
+    "stick_button": "RightStick"
+  },
+  "deadzone_left": 0.1,
+  "deadzone_right": 0.1,
+  "range_left": 1,
+  "range_right": 1,
+  "trigger_threshold": 0.5,
+  "motion": {
+    "motion_backend": "GamepadDriver",
+    "sensitivity": 100,
+    "gyro_deadzone": 1,
+    "enable_motion": false
+  },
+  "rumble": {
+    "strong_rumble": 1,
+    "weak_rumble": 1,
+    "enable_rumble": true
+  },
+  "left_joycon": {
+    "button_minus": "Back",
+    "button_l": "LeftShoulder",
+    "button_zl": "LeftTrigger",
+    "button_sl": "Unbound",
+    "button_sr": "Unbound",
+    "dpad_up": "DpadUp",
+    "dpad_down": "DpadDown",
+    "dpad_left": "DpadLeft",
+    "dpad_right": "DpadRight"
+  },
+  "right_joycon": {
+    "button_plus": "Start",
+    "button_r": "RightShoulder",
+    "button_zr": "RightTrigger",
+    "button_sl": "Unbound",
+    "button_sr": "Unbound",
+    "button_x": "Y",
+    "button_b": "A",
+    "button_y": "X",
+    "button_a": "B"
+  },
+  "version": 1,
+  "backend": "GamepadSDL2",
+  "id": "3-f7390003-28de-0000-ff11-000001000000",
+  "controller_type": "ProController",
+  "player_index": "Player4"
+}
diff --git a/emu-configs/ryujinx/profiles/controller/SteamInput-Gyro.json b/emu-configs/ryujinx/profiles/controller/SteamInput-Gyro.json
new file mode 100644
index 00000000..e58b7afa
--- /dev/null
+++ b/emu-configs/ryujinx/profiles/controller/SteamInput-Gyro.json
@@ -0,0 +1,64 @@
+{
+  "left_joycon_stick": {
+    "joystick": "Left",
+    "invert_stick_x": false,
+    "invert_stick_y": false,
+    "rotate90_cw": false,
+    "stick_button": "LeftStick"
+  },
+  "right_joycon_stick": {
+    "joystick": "Right",
+    "invert_stick_x": false,
+    "invert_stick_y": false,
+    "rotate90_cw": false,
+    "stick_button": "RightStick"
+  },
+    "deadzone_left": 0.1,
+    "deadzone_right": 0.1,
+    "range_left": 1,
+    "range_right": 1,
+    "trigger_threshold": 0.5,
+    "motion": {
+      "slot": 0,
+      "alt_slot": 0,
+      "mirror_input": false,
+      "dsu_server_host": "127.0.0.1",
+      "dsu_server_port": 26760,
+      "motion_backend": "CemuHook",
+      "sensitivity": 100,
+      "gyro_deadzone": 1,
+      "enable_motion": true
+      },
+      "rumble": {
+        "strong_rumble": 1,
+        "weak_rumble": 1,
+        "enable_rumble": true
+  },
+  "left_joycon": {
+    "button_minus": "Back",
+    "button_l": "LeftShoulder",
+    "button_zl": "LeftTrigger",
+    "button_sl": "Unbound",
+    "button_sr": "Unbound",
+    "dpad_up": "DpadUp",
+    "dpad_down": "DpadDown",
+    "dpad_left": "DpadLeft",
+    "dpad_right": "DpadRight"
+  },
+  "right_joycon": {
+    "button_plus": "Start",
+    "button_r": "RightShoulder",
+    "button_zr": "RightTrigger",
+    "button_sl": "Unbound",
+    "button_sr": "Unbound",
+    "button_x": "Y",
+    "button_b": "A",
+    "button_y": "X",
+    "button_a": "B"
+  },
+  "version": 1,
+  "backend": "GamepadSDL2",
+  "id": "0-f6790003-28de-0000-ff11-000001000000",
+  "controller_type": "ProController",
+  "player_index": "Player1"
+}
diff --git a/functions/prepare_component.sh b/functions/prepare_component.sh
index 8d97b1a4..e3a9cc92 100644
--- a/functions/prepare_component.sh
+++ b/functions/prepare_component.sh
@@ -594,6 +594,7 @@ prepare_component() {
         rm -rf /var/config/Ryujinx
         create_dir /var/config/Ryujinx/system
         cp -fv $emuconfigs/ryujinx/Config.json $ryujinxconf
+        cp -fvr $emuconfigs/ryujinx/profiles /var/config/Ryujinx/
         log d "Replacing placeholders in \"$ryujinxconf\""
         sed -i 's#RETRODECKHOMEDIR#'$rdhome'#g' "$ryujinxconf"
         log i "Linking switch nand/saves folder"