diff --git a/emu-configs/rpcs3/input_configs/global/Default.yml b/emu-configs/rpcs3/input_configs/global/Default.yml
index 58f42cdf..a001bfd0 100644
--- a/emu-configs/rpcs3/input_configs/global/Default.yml
+++ b/emu-configs/rpcs3/input_configs/global/Default.yml
@@ -40,7 +40,241 @@ Player 1 Input:
       Mirrored: false
       Shift: 0
     Motion Sensor G:
-      Axis: RY
+      Axis: RX
+      Mirrored: false
+      Shift: 0
+    Pressure Intensity Button: ""
+    Pressure Intensity Percent: 50
+    Left Stick Multiplier: 100
+    Right Stick Multiplier: 100
+    Left Stick Deadzone: 30
+    Right Stick Deadzone: 30
+    Left Trigger Threshold: 0
+    Right Trigger Threshold: 0
+    Left Pad Squircling Factor: 5000
+    Right Pad Squircling Factor: 5000
+    Color Value R: 0
+    Color Value G: 0
+    Color Value B: 20
+    Blink LED when battery is below 20%: true
+    Use LED as a battery indicator: false
+    LED battery indicator brightness: 10
+    Player LED enabled: true
+    Enable Large Vibration Motor: true
+    Enable Small Vibration Motor: true
+    Switch Vibration Motors: false
+    Mouse Movement Mode: Relative
+    Mouse Deadzone X Axis: 60
+    Mouse Deadzone Y Axis: 60
+    Mouse Acceleration X Axis: 200
+    Mouse Acceleration Y Axis: 250
+    Left Stick Lerp Factor: 100
+    Right Stick Lerp Factor: 100
+    Analog Button Lerp Factor: 100
+    Trigger Lerp Factor: 100
+    Device Class Type: 0
+    Vendor ID: 1356
+    Product ID: 616
+  Buddy Device: ""
+Player 2 Input:
+  Handler: Evdev
+  Device: Microsoft X-Box 360 pad 1
+  Config:
+    Left Stick Left: LX-
+    Left Stick Down: LY+
+    Left Stick Right: LX+
+    Left Stick Up: LY-
+    Right Stick Left: RX-
+    Right Stick Down: RY+
+    Right Stick Right: RX+
+    Right Stick Up: RY-
+    Start: Start
+    Select: Select
+    PS Button: Mode
+    Square: X
+    Cross: A
+    Circle: B
+    Triangle: Y
+    Left: Hat0 X-
+    Down: Hat0 Y+
+    Right: Hat0 X+
+    Up: Hat0 Y-
+    R1: TR
+    R2: RZ+
+    R3: Thumb R
+    L1: TL
+    L2: LZ+
+    L3: Thumb L
+    Motion Sensor X:
+      Axis: X
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Y:
+      Axis: Y
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Z:
+      Axis: Z
+      Mirrored: false
+      Shift: 0
+    Motion Sensor G:
+      Axis: RX
+      Mirrored: false
+      Shift: 0
+    Pressure Intensity Button: ""
+    Pressure Intensity Percent: 50
+    Left Stick Multiplier: 100
+    Right Stick Multiplier: 100
+    Left Stick Deadzone: 30
+    Right Stick Deadzone: 30
+    Left Trigger Threshold: 0
+    Right Trigger Threshold: 0
+    Left Pad Squircling Factor: 5000
+    Right Pad Squircling Factor: 5000
+    Color Value R: 0
+    Color Value G: 0
+    Color Value B: 20
+    Blink LED when battery is below 20%: true
+    Use LED as a battery indicator: false
+    LED battery indicator brightness: 10
+    Player LED enabled: true
+    Enable Large Vibration Motor: true
+    Enable Small Vibration Motor: true
+    Switch Vibration Motors: false
+    Mouse Movement Mode: Relative
+    Mouse Deadzone X Axis: 60
+    Mouse Deadzone Y Axis: 60
+    Mouse Acceleration X Axis: 200
+    Mouse Acceleration Y Axis: 250
+    Left Stick Lerp Factor: 100
+    Right Stick Lerp Factor: 100
+    Analog Button Lerp Factor: 100
+    Trigger Lerp Factor: 100
+    Device Class Type: 0
+    Vendor ID: 1356
+    Product ID: 616
+  Buddy Device: ""
+Player 3 Input:
+  Handler: Evdev
+  Device: Microsoft X-Box 360 pad 2
+  Config:
+    Left Stick Left: LX-
+    Left Stick Down: LY+
+    Left Stick Right: LX+
+    Left Stick Up: LY-
+    Right Stick Left: RX-
+    Right Stick Down: RY+
+    Right Stick Right: RX+
+    Right Stick Up: RY-
+    Start: Start
+    Select: Select
+    PS Button: Mode
+    Square: X
+    Cross: A
+    Circle: B
+    Triangle: Y
+    Left: Hat0 X-
+    Down: Hat0 Y+
+    Right: Hat0 X+
+    Up: Hat0 Y-
+    R1: TR
+    R2: RZ+
+    R3: Thumb R
+    L1: TL
+    L2: LZ+
+    L3: Thumb L
+    Motion Sensor X:
+      Axis: X
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Y:
+      Axis: Y
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Z:
+      Axis: Z
+      Mirrored: false
+      Shift: 0
+    Motion Sensor G:
+      Axis: RX
+      Mirrored: false
+      Shift: 0
+    Pressure Intensity Button: ""
+    Pressure Intensity Percent: 50
+    Left Stick Multiplier: 100
+    Right Stick Multiplier: 100
+    Left Stick Deadzone: 30
+    Right Stick Deadzone: 30
+    Left Trigger Threshold: 0
+    Right Trigger Threshold: 0
+    Left Pad Squircling Factor: 5000
+    Right Pad Squircling Factor: 5000
+    Color Value R: 0
+    Color Value G: 0
+    Color Value B: 20
+    Blink LED when battery is below 20%: true
+    Use LED as a battery indicator: false
+    LED battery indicator brightness: 10
+    Player LED enabled: true
+    Enable Large Vibration Motor: true
+    Enable Small Vibration Motor: true
+    Switch Vibration Motors: false
+    Mouse Movement Mode: Relative
+    Mouse Deadzone X Axis: 60
+    Mouse Deadzone Y Axis: 60
+    Mouse Acceleration X Axis: 200
+    Mouse Acceleration Y Axis: 250
+    Left Stick Lerp Factor: 100
+    Right Stick Lerp Factor: 100
+    Analog Button Lerp Factor: 100
+    Trigger Lerp Factor: 100
+    Device Class Type: 0
+    Vendor ID: 1356
+    Product ID: 616
+  Buddy Device: ""
+Player 4 Input:
+  Handler: Evdev
+  Device: Microsoft X-Box 360 pad 3
+  Config:
+    Left Stick Left: LX-
+    Left Stick Down: LY+
+    Left Stick Right: LX+
+    Left Stick Up: LY-
+    Right Stick Left: RX-
+    Right Stick Down: RY+
+    Right Stick Right: RX+
+    Right Stick Up: RY-
+    Start: Start
+    Select: Select
+    PS Button: Mode
+    Square: X
+    Cross: A
+    Circle: B
+    Triangle: Y
+    Left: Hat0 X-
+    Down: Hat0 Y+
+    Right: Hat0 X+
+    Up: Hat0 Y-
+    R1: TR
+    R2: RZ+
+    R3: Thumb R
+    L1: TL
+    L2: LZ+
+    L3: Thumb L
+    Motion Sensor X:
+      Axis: X
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Y:
+      Axis: Y
+      Mirrored: false
+      Shift: 0
+    Motion Sensor Z:
+      Axis: Z
+      Mirrored: false
+      Shift: 0
+    Motion Sensor G:
+      Axis: RX
       Mirrored: false
       Shift: 0
     Pressure Intensity Button: ""
@@ -76,240 +310,6 @@ Player 1 Input:
     Vendor ID: 1356
     Product ID: 616
   Buddy Device: ""
-Player 2 Input:
-  Handler: "Null"
-  Device: "Null"
-  Config:
-    Left Stick Left: ""
-    Left Stick Down: ""
-    Left Stick Right: ""
-    Left Stick Up: ""
-    Right Stick Left: ""
-    Right Stick Down: ""
-    Right Stick Right: ""
-    Right Stick Up: ""
-    Start: ""
-    Select: ""
-    PS Button: ""
-    Square: ""
-    Cross: ""
-    Circle: ""
-    Triangle: ""
-    Left: ""
-    Down: ""
-    Right: ""
-    Up: ""
-    R1: ""
-    R2: ""
-    R3: ""
-    L1: ""
-    L2: ""
-    L3: ""
-    Motion Sensor X:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Y:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Z:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor G:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Pressure Intensity Button: ""
-    Pressure Intensity Percent: 50
-    Left Stick Multiplier: 100
-    Right Stick Multiplier: 100
-    Left Stick Deadzone: 0
-    Right Stick Deadzone: 0
-    Left Trigger Threshold: 0
-    Right Trigger Threshold: 0
-    Left Pad Squircling Factor: 0
-    Right Pad Squircling Factor: 0
-    Color Value R: 0
-    Color Value G: 0
-    Color Value B: 0
-    Blink LED when battery is below 20%: true
-    Use LED as a battery indicator: false
-    LED battery indicator brightness: 50
-    Player LED enabled: true
-    Enable Large Vibration Motor: true
-    Enable Small Vibration Motor: true
-    Switch Vibration Motors: false
-    Mouse Movement Mode: Relative
-    Mouse Deadzone X Axis: 60
-    Mouse Deadzone Y Axis: 60
-    Mouse Acceleration X Axis: 200
-    Mouse Acceleration Y Axis: 250
-    Left Stick Lerp Factor: 100
-    Right Stick Lerp Factor: 100
-    Analog Button Lerp Factor: 100
-    Trigger Lerp Factor: 100
-    Device Class Type: 0
-    Vendor ID: 0
-    Product ID: 0
-  Buddy Device: "Null"
-Player 3 Input:
-  Handler: "Null"
-  Device: "Null"
-  Config:
-    Left Stick Left: ""
-    Left Stick Down: ""
-    Left Stick Right: ""
-    Left Stick Up: ""
-    Right Stick Left: ""
-    Right Stick Down: ""
-    Right Stick Right: ""
-    Right Stick Up: ""
-    Start: ""
-    Select: ""
-    PS Button: ""
-    Square: ""
-    Cross: ""
-    Circle: ""
-    Triangle: ""
-    Left: ""
-    Down: ""
-    Right: ""
-    Up: ""
-    R1: ""
-    R2: ""
-    R3: ""
-    L1: ""
-    L2: ""
-    L3: ""
-    Motion Sensor X:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Y:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Z:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor G:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Pressure Intensity Button: ""
-    Pressure Intensity Percent: 50
-    Left Stick Multiplier: 100
-    Right Stick Multiplier: 100
-    Left Stick Deadzone: 0
-    Right Stick Deadzone: 0
-    Left Trigger Threshold: 0
-    Right Trigger Threshold: 0
-    Left Pad Squircling Factor: 0
-    Right Pad Squircling Factor: 0
-    Color Value R: 0
-    Color Value G: 0
-    Color Value B: 0
-    Blink LED when battery is below 20%: true
-    Use LED as a battery indicator: false
-    LED battery indicator brightness: 50
-    Player LED enabled: true
-    Enable Large Vibration Motor: true
-    Enable Small Vibration Motor: true
-    Switch Vibration Motors: false
-    Mouse Movement Mode: Relative
-    Mouse Deadzone X Axis: 60
-    Mouse Deadzone Y Axis: 60
-    Mouse Acceleration X Axis: 200
-    Mouse Acceleration Y Axis: 250
-    Left Stick Lerp Factor: 100
-    Right Stick Lerp Factor: 100
-    Analog Button Lerp Factor: 100
-    Trigger Lerp Factor: 100
-    Device Class Type: 0
-    Vendor ID: 0
-    Product ID: 0
-  Buddy Device: "Null"
-Player 4 Input:
-  Handler: "Null"
-  Device: "Null"
-  Config:
-    Left Stick Left: ""
-    Left Stick Down: ""
-    Left Stick Right: ""
-    Left Stick Up: ""
-    Right Stick Left: ""
-    Right Stick Down: ""
-    Right Stick Right: ""
-    Right Stick Up: ""
-    Start: ""
-    Select: ""
-    PS Button: ""
-    Square: ""
-    Cross: ""
-    Circle: ""
-    Triangle: ""
-    Left: ""
-    Down: ""
-    Right: ""
-    Up: ""
-    R1: ""
-    R2: ""
-    R3: ""
-    L1: ""
-    L2: ""
-    L3: ""
-    Motion Sensor X:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Y:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Z:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor G:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Pressure Intensity Button: ""
-    Pressure Intensity Percent: 50
-    Left Stick Multiplier: 100
-    Right Stick Multiplier: 100
-    Left Stick Deadzone: 0
-    Right Stick Deadzone: 0
-    Left Trigger Threshold: 0
-    Right Trigger Threshold: 0
-    Left Pad Squircling Factor: 0
-    Right Pad Squircling Factor: 0
-    Color Value R: 0
-    Color Value G: 0
-    Color Value B: 0
-    Blink LED when battery is below 20%: true
-    Use LED as a battery indicator: false
-    LED battery indicator brightness: 50
-    Player LED enabled: true
-    Enable Large Vibration Motor: true
-    Enable Small Vibration Motor: true
-    Switch Vibration Motors: false
-    Mouse Movement Mode: Relative
-    Mouse Deadzone X Axis: 60
-    Mouse Deadzone Y Axis: 60
-    Mouse Acceleration X Axis: 200
-    Mouse Acceleration Y Axis: 250
-    Left Stick Lerp Factor: 100
-    Right Stick Lerp Factor: 100
-    Analog Button Lerp Factor: 100
-    Trigger Lerp Factor: 100
-    Device Class Type: 0
-    Vendor ID: 0
-    Product ID: 0
-  Buddy Device: "Null"
 Player 5 Input:
   Handler: "Null"
   Device: "Null"
@@ -385,9 +385,9 @@ Player 5 Input:
     Analog Button Lerp Factor: 100
     Trigger Lerp Factor: 100
     Device Class Type: 0
-    Vendor ID: 0
-    Product ID: 0
-  Buddy Device: "Null"
+    Vendor ID: 1356
+    Product ID: 616
+  Buddy Device: ""
 Player 6 Input:
   Handler: "Null"
   Device: "Null"
@@ -465,7 +465,7 @@ Player 6 Input:
     Device Class Type: 0
     Vendor ID: 0
     Product ID: 0
-  Buddy Device: "Null"
+  Buddy Device: ""
 Player 7 Input:
   Handler: "Null"
   Device: "Null"
@@ -543,4 +543,4 @@ Player 7 Input:
     Device Class Type: 0
     Vendor ID: 0
     Product ID: 0
-  Buddy Device: "Null"
\ No newline at end of file
+  Buddy Device: ""
diff --git a/incconfigs/RPCS3/input_configs/global/Default.yml b/incconfigs/RPCS3/input_configs/global/Default.yml
deleted file mode 100644
index a001bfd0..00000000
--- a/incconfigs/RPCS3/input_configs/global/Default.yml
+++ /dev/null
@@ -1,546 +0,0 @@
-Player 1 Input:
-  Handler: Evdev
-  Device: Microsoft X-Box 360 pad 0
-  Config:
-    Left Stick Left: LX-
-    Left Stick Down: LY+
-    Left Stick Right: LX+
-    Left Stick Up: LY-
-    Right Stick Left: RX-
-    Right Stick Down: RY+
-    Right Stick Right: RX+
-    Right Stick Up: RY-
-    Start: Start
-    Select: Select
-    PS Button: Mode
-    Square: X
-    Cross: A
-    Circle: B
-    Triangle: Y
-    Left: Hat0 X-
-    Down: Hat0 Y+
-    Right: Hat0 X+
-    Up: Hat0 Y-
-    R1: TR
-    R2: RZ+
-    R3: Thumb R
-    L1: TL
-    L2: LZ+
-    L3: Thumb L
-    Motion Sensor X:
-      Axis: X
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Y:
-      Axis: Y
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Z:
-      Axis: Z
-      Mirrored: false
-      Shift: 0
-    Motion Sensor G:
-      Axis: RX
-      Mirrored: false
-      Shift: 0
-    Pressure Intensity Button: ""
-    Pressure Intensity Percent: 50
-    Left Stick Multiplier: 100
-    Right Stick Multiplier: 100
-    Left Stick Deadzone: 30
-    Right Stick Deadzone: 30
-    Left Trigger Threshold: 0
-    Right Trigger Threshold: 0
-    Left Pad Squircling Factor: 5000
-    Right Pad Squircling Factor: 5000
-    Color Value R: 0
-    Color Value G: 0
-    Color Value B: 20
-    Blink LED when battery is below 20%: true
-    Use LED as a battery indicator: false
-    LED battery indicator brightness: 10
-    Player LED enabled: true
-    Enable Large Vibration Motor: true
-    Enable Small Vibration Motor: true
-    Switch Vibration Motors: false
-    Mouse Movement Mode: Relative
-    Mouse Deadzone X Axis: 60
-    Mouse Deadzone Y Axis: 60
-    Mouse Acceleration X Axis: 200
-    Mouse Acceleration Y Axis: 250
-    Left Stick Lerp Factor: 100
-    Right Stick Lerp Factor: 100
-    Analog Button Lerp Factor: 100
-    Trigger Lerp Factor: 100
-    Device Class Type: 0
-    Vendor ID: 1356
-    Product ID: 616
-  Buddy Device: ""
-Player 2 Input:
-  Handler: Evdev
-  Device: Microsoft X-Box 360 pad 1
-  Config:
-    Left Stick Left: LX-
-    Left Stick Down: LY+
-    Left Stick Right: LX+
-    Left Stick Up: LY-
-    Right Stick Left: RX-
-    Right Stick Down: RY+
-    Right Stick Right: RX+
-    Right Stick Up: RY-
-    Start: Start
-    Select: Select
-    PS Button: Mode
-    Square: X
-    Cross: A
-    Circle: B
-    Triangle: Y
-    Left: Hat0 X-
-    Down: Hat0 Y+
-    Right: Hat0 X+
-    Up: Hat0 Y-
-    R1: TR
-    R2: RZ+
-    R3: Thumb R
-    L1: TL
-    L2: LZ+
-    L3: Thumb L
-    Motion Sensor X:
-      Axis: X
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Y:
-      Axis: Y
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Z:
-      Axis: Z
-      Mirrored: false
-      Shift: 0
-    Motion Sensor G:
-      Axis: RX
-      Mirrored: false
-      Shift: 0
-    Pressure Intensity Button: ""
-    Pressure Intensity Percent: 50
-    Left Stick Multiplier: 100
-    Right Stick Multiplier: 100
-    Left Stick Deadzone: 30
-    Right Stick Deadzone: 30
-    Left Trigger Threshold: 0
-    Right Trigger Threshold: 0
-    Left Pad Squircling Factor: 5000
-    Right Pad Squircling Factor: 5000
-    Color Value R: 0
-    Color Value G: 0
-    Color Value B: 20
-    Blink LED when battery is below 20%: true
-    Use LED as a battery indicator: false
-    LED battery indicator brightness: 10
-    Player LED enabled: true
-    Enable Large Vibration Motor: true
-    Enable Small Vibration Motor: true
-    Switch Vibration Motors: false
-    Mouse Movement Mode: Relative
-    Mouse Deadzone X Axis: 60
-    Mouse Deadzone Y Axis: 60
-    Mouse Acceleration X Axis: 200
-    Mouse Acceleration Y Axis: 250
-    Left Stick Lerp Factor: 100
-    Right Stick Lerp Factor: 100
-    Analog Button Lerp Factor: 100
-    Trigger Lerp Factor: 100
-    Device Class Type: 0
-    Vendor ID: 1356
-    Product ID: 616
-  Buddy Device: ""
-Player 3 Input:
-  Handler: Evdev
-  Device: Microsoft X-Box 360 pad 2
-  Config:
-    Left Stick Left: LX-
-    Left Stick Down: LY+
-    Left Stick Right: LX+
-    Left Stick Up: LY-
-    Right Stick Left: RX-
-    Right Stick Down: RY+
-    Right Stick Right: RX+
-    Right Stick Up: RY-
-    Start: Start
-    Select: Select
-    PS Button: Mode
-    Square: X
-    Cross: A
-    Circle: B
-    Triangle: Y
-    Left: Hat0 X-
-    Down: Hat0 Y+
-    Right: Hat0 X+
-    Up: Hat0 Y-
-    R1: TR
-    R2: RZ+
-    R3: Thumb R
-    L1: TL
-    L2: LZ+
-    L3: Thumb L
-    Motion Sensor X:
-      Axis: X
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Y:
-      Axis: Y
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Z:
-      Axis: Z
-      Mirrored: false
-      Shift: 0
-    Motion Sensor G:
-      Axis: RX
-      Mirrored: false
-      Shift: 0
-    Pressure Intensity Button: ""
-    Pressure Intensity Percent: 50
-    Left Stick Multiplier: 100
-    Right Stick Multiplier: 100
-    Left Stick Deadzone: 30
-    Right Stick Deadzone: 30
-    Left Trigger Threshold: 0
-    Right Trigger Threshold: 0
-    Left Pad Squircling Factor: 5000
-    Right Pad Squircling Factor: 5000
-    Color Value R: 0
-    Color Value G: 0
-    Color Value B: 20
-    Blink LED when battery is below 20%: true
-    Use LED as a battery indicator: false
-    LED battery indicator brightness: 10
-    Player LED enabled: true
-    Enable Large Vibration Motor: true
-    Enable Small Vibration Motor: true
-    Switch Vibration Motors: false
-    Mouse Movement Mode: Relative
-    Mouse Deadzone X Axis: 60
-    Mouse Deadzone Y Axis: 60
-    Mouse Acceleration X Axis: 200
-    Mouse Acceleration Y Axis: 250
-    Left Stick Lerp Factor: 100
-    Right Stick Lerp Factor: 100
-    Analog Button Lerp Factor: 100
-    Trigger Lerp Factor: 100
-    Device Class Type: 0
-    Vendor ID: 1356
-    Product ID: 616
-  Buddy Device: ""
-Player 4 Input:
-  Handler: Evdev
-  Device: Microsoft X-Box 360 pad 3
-  Config:
-    Left Stick Left: LX-
-    Left Stick Down: LY+
-    Left Stick Right: LX+
-    Left Stick Up: LY-
-    Right Stick Left: RX-
-    Right Stick Down: RY+
-    Right Stick Right: RX+
-    Right Stick Up: RY-
-    Start: Start
-    Select: Select
-    PS Button: Mode
-    Square: X
-    Cross: A
-    Circle: B
-    Triangle: Y
-    Left: Hat0 X-
-    Down: Hat0 Y+
-    Right: Hat0 X+
-    Up: Hat0 Y-
-    R1: TR
-    R2: RZ+
-    R3: Thumb R
-    L1: TL
-    L2: LZ+
-    L3: Thumb L
-    Motion Sensor X:
-      Axis: X
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Y:
-      Axis: Y
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Z:
-      Axis: Z
-      Mirrored: false
-      Shift: 0
-    Motion Sensor G:
-      Axis: RX
-      Mirrored: false
-      Shift: 0
-    Pressure Intensity Button: ""
-    Pressure Intensity Percent: 50
-    Left Stick Multiplier: 100
-    Right Stick Multiplier: 100
-    Left Stick Deadzone: 30
-    Right Stick Deadzone: 30
-    Left Trigger Threshold: 0
-    Right Trigger Threshold: 0
-    Left Pad Squircling Factor: 5000
-    Right Pad Squircling Factor: 5000
-    Color Value R: 0
-    Color Value G: 0
-    Color Value B: 0
-    Blink LED when battery is below 20%: true
-    Use LED as a battery indicator: false
-    LED battery indicator brightness: 50
-    Player LED enabled: true
-    Enable Large Vibration Motor: true
-    Enable Small Vibration Motor: true
-    Switch Vibration Motors: false
-    Mouse Movement Mode: Relative
-    Mouse Deadzone X Axis: 60
-    Mouse Deadzone Y Axis: 60
-    Mouse Acceleration X Axis: 200
-    Mouse Acceleration Y Axis: 250
-    Left Stick Lerp Factor: 100
-    Right Stick Lerp Factor: 100
-    Analog Button Lerp Factor: 100
-    Trigger Lerp Factor: 100
-    Device Class Type: 0
-    Vendor ID: 1356
-    Product ID: 616
-  Buddy Device: ""
-Player 5 Input:
-  Handler: "Null"
-  Device: "Null"
-  Config:
-    Left Stick Left: ""
-    Left Stick Down: ""
-    Left Stick Right: ""
-    Left Stick Up: ""
-    Right Stick Left: ""
-    Right Stick Down: ""
-    Right Stick Right: ""
-    Right Stick Up: ""
-    Start: ""
-    Select: ""
-    PS Button: ""
-    Square: ""
-    Cross: ""
-    Circle: ""
-    Triangle: ""
-    Left: ""
-    Down: ""
-    Right: ""
-    Up: ""
-    R1: ""
-    R2: ""
-    R3: ""
-    L1: ""
-    L2: ""
-    L3: ""
-    Motion Sensor X:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Y:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Z:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor G:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Pressure Intensity Button: ""
-    Pressure Intensity Percent: 50
-    Left Stick Multiplier: 100
-    Right Stick Multiplier: 100
-    Left Stick Deadzone: 0
-    Right Stick Deadzone: 0
-    Left Trigger Threshold: 0
-    Right Trigger Threshold: 0
-    Left Pad Squircling Factor: 0
-    Right Pad Squircling Factor: 0
-    Color Value R: 0
-    Color Value G: 0
-    Color Value B: 0
-    Blink LED when battery is below 20%: true
-    Use LED as a battery indicator: false
-    LED battery indicator brightness: 50
-    Player LED enabled: true
-    Enable Large Vibration Motor: true
-    Enable Small Vibration Motor: true
-    Switch Vibration Motors: false
-    Mouse Movement Mode: Relative
-    Mouse Deadzone X Axis: 60
-    Mouse Deadzone Y Axis: 60
-    Mouse Acceleration X Axis: 200
-    Mouse Acceleration Y Axis: 250
-    Left Stick Lerp Factor: 100
-    Right Stick Lerp Factor: 100
-    Analog Button Lerp Factor: 100
-    Trigger Lerp Factor: 100
-    Device Class Type: 0
-    Vendor ID: 1356
-    Product ID: 616
-  Buddy Device: ""
-Player 6 Input:
-  Handler: "Null"
-  Device: "Null"
-  Config:
-    Left Stick Left: ""
-    Left Stick Down: ""
-    Left Stick Right: ""
-    Left Stick Up: ""
-    Right Stick Left: ""
-    Right Stick Down: ""
-    Right Stick Right: ""
-    Right Stick Up: ""
-    Start: ""
-    Select: ""
-    PS Button: ""
-    Square: ""
-    Cross: ""
-    Circle: ""
-    Triangle: ""
-    Left: ""
-    Down: ""
-    Right: ""
-    Up: ""
-    R1: ""
-    R2: ""
-    R3: ""
-    L1: ""
-    L2: ""
-    L3: ""
-    Motion Sensor X:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Y:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Z:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor G:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Pressure Intensity Button: ""
-    Pressure Intensity Percent: 50
-    Left Stick Multiplier: 100
-    Right Stick Multiplier: 100
-    Left Stick Deadzone: 0
-    Right Stick Deadzone: 0
-    Left Trigger Threshold: 0
-    Right Trigger Threshold: 0
-    Left Pad Squircling Factor: 0
-    Right Pad Squircling Factor: 0
-    Color Value R: 0
-    Color Value G: 0
-    Color Value B: 0
-    Blink LED when battery is below 20%: true
-    Use LED as a battery indicator: false
-    LED battery indicator brightness: 50
-    Player LED enabled: true
-    Enable Large Vibration Motor: true
-    Enable Small Vibration Motor: true
-    Switch Vibration Motors: false
-    Mouse Movement Mode: Relative
-    Mouse Deadzone X Axis: 60
-    Mouse Deadzone Y Axis: 60
-    Mouse Acceleration X Axis: 200
-    Mouse Acceleration Y Axis: 250
-    Left Stick Lerp Factor: 100
-    Right Stick Lerp Factor: 100
-    Analog Button Lerp Factor: 100
-    Trigger Lerp Factor: 100
-    Device Class Type: 0
-    Vendor ID: 0
-    Product ID: 0
-  Buddy Device: ""
-Player 7 Input:
-  Handler: "Null"
-  Device: "Null"
-  Config:
-    Left Stick Left: ""
-    Left Stick Down: ""
-    Left Stick Right: ""
-    Left Stick Up: ""
-    Right Stick Left: ""
-    Right Stick Down: ""
-    Right Stick Right: ""
-    Right Stick Up: ""
-    Start: ""
-    Select: ""
-    PS Button: ""
-    Square: ""
-    Cross: ""
-    Circle: ""
-    Triangle: ""
-    Left: ""
-    Down: ""
-    Right: ""
-    Up: ""
-    R1: ""
-    R2: ""
-    R3: ""
-    L1: ""
-    L2: ""
-    L3: ""
-    Motion Sensor X:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Y:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor Z:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Motion Sensor G:
-      Axis: ""
-      Mirrored: false
-      Shift: 0
-    Pressure Intensity Button: ""
-    Pressure Intensity Percent: 50
-    Left Stick Multiplier: 100
-    Right Stick Multiplier: 100
-    Left Stick Deadzone: 0
-    Right Stick Deadzone: 0
-    Left Trigger Threshold: 0
-    Right Trigger Threshold: 0
-    Left Pad Squircling Factor: 0
-    Right Pad Squircling Factor: 0
-    Color Value R: 0
-    Color Value G: 0
-    Color Value B: 0
-    Blink LED when battery is below 20%: true
-    Use LED as a battery indicator: false
-    LED battery indicator brightness: 50
-    Player LED enabled: true
-    Enable Large Vibration Motor: true
-    Enable Small Vibration Motor: true
-    Switch Vibration Motors: false
-    Mouse Movement Mode: Relative
-    Mouse Deadzone X Axis: 60
-    Mouse Deadzone Y Axis: 60
-    Mouse Acceleration X Axis: 200
-    Mouse Acceleration Y Axis: 250
-    Left Stick Lerp Factor: 100
-    Right Stick Lerp Factor: 100
-    Analog Button Lerp Factor: 100
-    Trigger Lerp Factor: 100
-    Device Class Type: 0
-    Vendor ID: 0
-    Product ID: 0
-  Buddy Device: ""
diff --git a/incconfigs/whatis.readme b/incconfigs/whatis.readme
index 170d33fe..d89b69c2 100644
--- a/incconfigs/whatis.readme
+++ b/incconfigs/whatis.readme
@@ -7,10 +7,6 @@ Ryujinx  (New)
 
 - We did not have this before
 
-RPCS3
-
-- Input configs for 1-4
-
 Yuzu
 
 - Needs to be tested
diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index d29bb517..885aa273 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -92,7 +92,6 @@
                <li>Quit button after emulators reset should act as an actual full quit button</li>
                <li>Created a quit_retrodeck function to ease the quit in the scripts.</li>
                <li>Logs folder is now in retrodeck/logs (previously was .logs)</li>
-               <li>RPCS3 is now running via shortcut (.desktop file) by default - WARN THE USERS TO MIGRATE</li>
                <li>Added controller config for PS4 and PS5</li>
                <li>Controller config overhaul</li>
                <li>Removed talk names in the manifest as they're not needed anymore as enabled by default</li>
@@ -104,6 +103,8 @@
                <li>DUCKSTATION: All controlls now go via SDL</li>
                <li>DUCKSTATION: Updated to 4 controllers</li>
                <li>PCSX2: general and graphical tweaks</li>
+               <li>RPCS3 is now running via shortcut (.desktop file) by default - WARN THE USERS TO MIGRATE</li>
+               <li>RPCS3: Updated to 4 controllers</li>
             </ul>
             <p>Fixes:</p>
             <ul>