From e34eeeb2580529b1f0af6166e9897f27b25118b1 Mon Sep 17 00:00:00 2001
From: rawdatafeel <108900299+rawdatafeel@users.noreply.github.com>
Date: Fri, 2 Jun 2023 20:03:07 -0400
Subject: [PATCH] Migrate to RPCS3 AppImage

---
 .../rpcs3/GuiConfigs/CurrentSettings.ini      |   2 +-
 configs/rpcs3/GuiConfigs/CurrentSettings.ini  |  59 ++
 configs/rpcs3/config.yml                      | 230 ++++++++
 .../rpcs3/input_configs/active_profiles.yml   |   2 +
 .../rpcs3/input_configs/global/Default.yml    | 539 ++++++++++++++++++
 configs/rpcs3/vfs.yml                         |  10 +
 .../sony-ps3-rpcs3-extracted_iso_psn.json     |   2 +-
 .../parsers/emudeck/sony-ps3-rpcs3-pkg.json   |   2 +-
 functions/EmuScripts/emuDeckRPCS3.sh          |  97 +++-
 icons/RPCS3.svg                               |  88 +++
 tools/binupdate/binupdate.sh                  |  10 +
 tools/launchers/rpcs3.sh                      |  30 +-
 12 files changed, 1045 insertions(+), 26 deletions(-)
 create mode 100644 configs/rpcs3/GuiConfigs/CurrentSettings.ini
 create mode 100644 configs/rpcs3/config.yml
 create mode 100644 configs/rpcs3/input_configs/active_profiles.yml
 create mode 100644 configs/rpcs3/input_configs/global/Default.yml
 create mode 100644 configs/rpcs3/vfs.yml
 create mode 100644 icons/RPCS3.svg

diff --git a/configs/net.rpcs3.RPCS3/config/rpcs3/GuiConfigs/CurrentSettings.ini b/configs/net.rpcs3.RPCS3/config/rpcs3/GuiConfigs/CurrentSettings.ini
index bf77f73b..8df3047f 100644
--- a/configs/net.rpcs3.RPCS3/config/rpcs3/GuiConfigs/CurrentSettings.ini
+++ b/configs/net.rpcs3.RPCS3/config/rpcs3/GuiConfigs/CurrentSettings.ini
@@ -36,7 +36,7 @@ level=4
 stack=true
 
 [Meta]
-currentStylesheet=Darker Style by TheMitoSan
+currentStylesheet=none
 discordState=
 showDebugTab=true
 useRichPresence=true
diff --git a/configs/rpcs3/GuiConfigs/CurrentSettings.ini b/configs/rpcs3/GuiConfigs/CurrentSettings.ini
new file mode 100644
index 00000000..2fcec557
--- /dev/null
+++ b/configs/rpcs3/GuiConfigs/CurrentSettings.ini
@@ -0,0 +1,59 @@
+[Config]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\xca\0\0\0\x1\0\0\x4!\0\0\x2\xcd\0\0\0\xca\0\0\0\x1e\0\0\x4!\0\0\x2\xcd\0\0\0\0\0\0\0\0\x5\0\0\0\0\xca\0\0\0\x1e\0\0\x4!\0\0\x2\xcd)
+
+[Debugger]
+splitterState=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\xff\xff\xff\xff\xff\xff\xff\xff\x1\xff\xff\xff\xff\x1\0\0\0\x1\0)
+
+[GSFrame]
+screen=0
+
+[GameList]
+hidden_list=@Invalid()
+iconColor=@Variant(\0\0\0\x43\x1\xff\xff\xf0\xf0\xf0\xf0\xf0\xf0\0\0)
+marginFactor=0.09
+sortAsc=true
+sortCol=1
+state=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x1\x1\0\0\0\0\0\0\0\0\0\0\0\xfH\x6\0\0\0\x4\0\0\0\x3\0\0\0\0\0\0\0\x6\0\0\0\0\0\0\0\t\0\0\0\0\0\0\0\n\0\0\0\0\0\0\x6\x15\0\0\0\xf\0\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x96\xff\xff\xff\xff\0\0\0\x1\0\0\0\0\0\0\0\xf\0\0\0U\0\0\0\x1\0\0\0\x2\0\0\0i\0\0\0\x1\0\0\0\0\0\0\0g\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0u\0\0\0\x1\0\0\0\0\0\0\0\x81\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\xbe\0\0\0\x1\0\0\0\0\0\0\0\xe6\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x92\0\0\0\x1\0\0\0\0\0\0\0\x97\0\0\0\x1\0\0\0\0\0\0\0\xa2\0\0\0\x1\0\0\0\0\0\0\0\x8b\0\0\0\x1\0\0\0\0\0\0\x3\xe8\x1\0\0\0\x8b)
+textFactor=2
+visibility_column_category=true
+visibility_column_compat=true
+visibility_column_dir_size=true
+visibility_column_firmware=false
+visibility_column_icon=true
+visibility_column_last_play=true
+visibility_column_move=true
+visibility_column_name=true
+visibility_column_parental=false
+visibility_column_path=false
+visibility_column_playtime=true
+visibility_column_resolution=true
+visibility_column_serial=true
+visibility_column_sound=false
+visibility_column_version=true
+
+[Localization]
+language=en
+
+[Logger]
+ANSI_code=true
+ERR_stack=true
+level=4
+stack=true
+
+[Meta]
+checkUpdateStart=true
+currentStylesheet=none
+discordState=
+enableUIColors=false
+showDebugTab=false
+useRichPresence=true
+
+[PadSettings]
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0~\0\0\0\0\0\0\x4m\0\0\x3\x1f\0\0\0~\0\0\0\x1d\0\0\x4m\0\0\x3\x1f\0\0\0\0\0\0\0\0\x5\0\0\0\0~\0\0\0\x1d\0\0\x4m\0\0\x3\x1f)
+
+[main_window]
+confirmationBoxExitGame=false
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x4\xff\0\0\x3\x1f\0\0\0\xc0\0\0\0\x86\0\0\x4?\0\0\x2\xb5\0\0\0\0\x2\0\0\0\x5\0\0\0\0\0\0\0\0\x1d\0\0\x4\xff\0\0\x3\x1f)
+infoBoxEnabledWelcome=false
+mwState=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\x5\0\0\0\x2\xa1\xfc\x2\0\0\0\x2\xfb\0\0\0\x10\0g\0\x61\0m\0\x65\0l\0i\0s\0t\x1\0\0\0\0\0\0\x1n\0\0\0^\0\xff\xff\xff\xfb\0\0\0\f\0l\0o\0g\0g\0\x65\0r\x1\0\0\x1t\0\0\x1-\0\0\0\xa8\0\xff\xff\xff\0\0\0\x1\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x10\0\x64\0\x65\0\x62\0u\0g\0g\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xd6\0\xff\xff\xff\0\0\0\0\0\0\x2\xa1\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
+windowState=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\0\0\0\x5\0\0\0\x2\xa1\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x1\0\0\0\x14\0m\0w\0_\0t\0o\0o\0l\0\x62\0\x61\0r\x1\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
\ No newline at end of file
diff --git a/configs/rpcs3/config.yml b/configs/rpcs3/config.yml
new file mode 100644
index 00000000..c444a08d
--- /dev/null
+++ b/configs/rpcs3/config.yml
@@ -0,0 +1,230 @@
+Core:
+  PPU Decoder: Recompiler (LLVM)
+  PPU Threads: 2
+  PPU Debug: false
+  PPU Calling History: false
+  Save LLVM logs: false
+  Use LLVM CPU: ""
+  Max LLVM Compile Threads: 0
+  PPU LLVM Greedy Mode: false
+  PPU LLVM Precompilation: true
+  Thread Scheduler Mode: Operating System
+  Set DAZ and FTZ: false
+  SPU Decoder: Recompiler (LLVM)
+  SPU Reservation Busy Waiting Percentage: 0
+  SPU GETLLAR Busy Waiting Percentage: 100
+  SPU Debug: false
+  MFC Debug: false
+  Preferred SPU Threads: 0
+  SPU delay penalty: 3
+  SPU loop detection: false
+  Max SPURS Threads: 6
+  SPU Block Size: Safe
+  Accurate GETLLAR: false
+  Accurate SPU DMA: false
+  Accurate SPU Reservations: true
+  Accurate Cache Line Stores: false
+  Accurate RSX reservation access: false
+  RSX FIFO Accuracy: Fast
+  SPU Verification: true
+  SPU Cache: true
+  SPU Profiler: false
+  MFC Commands Shuffling Limit: 0
+  MFC Commands Timeout: 0
+  MFC Commands Shuffling In Steps: false
+  Enable TSX: Disabled
+  Accurate xfloat: false
+  Approximate xfloat: true
+  Relaxed xfloat: true
+  Accurate PPU 128-byte Reservation Op Max Length: 0
+  Stub PPU Traps: 0
+  Full Width AVX-512: false
+  PPU LLVM Java Mode Handling: true
+  Use Accurate DFMA: true
+  PPU Set Saturation Bit: false
+  PPU Accurate Non-Java Mode: false
+  PPU Fixup Vector NaN Values: false
+  PPU Accurate Vector NaN Values: false
+  PPU Set FPCC Bits: false
+  Debug Console Mode: false
+  Hook static functions: false
+  Libraries Control:
+    []
+  HLE lwmutex: false
+  SPU LLVM Lower Bound: 0
+  SPU LLVM Upper Bound: 18446744073709551615
+  TSX Transaction First Limit: 800
+  TSX Transaction Second Limit: 2000
+  Clocks scale: 100
+  SPU Wake-Up Delay: 0
+  SPU Wake-Up Delay Thread Mask: 63
+  Max CPU Preempt Count: 0
+  Allow RSX CPU Preemptions: true
+  Sleep Timers Accuracy: As Host
+  Performance Report Threshold: 500
+  Enable Performance Report: false
+  Assume External Debugger: false
+VFS:
+  Enable /host_root/: false
+  Initialize Directories: true
+  Limit disk cache size: false
+  Disk cache maximum size (MB): 5120
+  Empty /dev_hdd0/tmp/: true
+Video:
+  Renderer: Vulkan
+  Resolution: 1280x720
+  Aspect ratio: 16:9
+  Frame limit: Auto
+  Second Frame Limit: 0
+  MSAA: Auto
+  Shader Mode: Async Shader Recompiler
+  Shader Precision: High
+  Write Color Buffers: false
+  Write Depth Buffer: false
+  Read Color Buffers: false
+  Read Depth Buffer: false
+  Log shader programs: false
+  VSync: false
+  Debug output: false
+  Debug overlay: false
+  Renderdoc Compatibility Mode: false
+  Use GPU texture scaling: false
+  Stretch To Display Area: false
+  Force High Precision Z buffer: false
+  Strict Rendering Mode: false
+  Disable ZCull Occlusion Queries: false
+  Disable Video Output: false
+  Disable Vertex Cache: false
+  Disable FIFO Reordering: false
+  Enable Frame Skip: false
+  Force CPU Blit: false
+  Disable On-Disk Shader Cache: false
+  Disable Vulkan Memory Allocator: false
+  Use full RGB output range: true
+  Strict Texture Flushing: false
+  Multithreaded RSX: false
+  Relaxed ZCULL Sync: false
+  3D Display Mode: Disabled
+  Debug Program Analyser: false
+  Accurate ZCULL stats: true
+  Consecutive Frames To Draw: 1
+  Consecutive Frames To Skip: 1
+  Resolution Scale: 100
+  Anisotropic Filter Override: 0
+  Texture LOD Bias Addend: 0
+  Minimum Scalable Dimension: 16
+  Shader Compiler Threads: 0
+  Driver Recovery Timeout: 1000000
+  Driver Wake-Up Delay: 1
+  Vblank Rate: 60
+  Vblank NTSC Fixup: false
+  DECR memory layout: false
+  Allow Host GPU Labels: false
+  Disable MSL Fast Math: false
+  Output Scaling Mode: Bilinear
+  Vulkan:
+    Adapter: AMD Custom GPU 0405 (RADV VANGOGH)
+    Force FIFO present mode: false
+    Force primitive restart flag: false
+    Exclusive Fullscreen Mode: Automatic
+    Asynchronous Texture Streaming 2: false
+    FidelityFX CAS Sharpening Intensity: 50
+    Asynchronous Queue Scheduler: Safe
+    VRAM allocation limit (MB): 65536
+  Performance Overlay:
+    Enabled: false
+    Enable Framerate Graph: false
+    Enable Frametime Graph: false
+    Framerate datapoints: 50
+    Frametime datapoints: 170
+    Detail level: Medium
+    Framerate graph detail level: All
+    Frametime graph detail level: All
+    Metrics update interval (ms): 350
+    Font size (px): 10
+    Position: Top Left
+    Font: n023055ms.ttf
+    Horizontal Margin (px): 50
+    Vertical Margin (px): 50
+    Center Horizontally: false
+    Center Vertically: false
+    Opacity (%): 70
+    Body Color (hex): "#FFE138FF"
+    Body Background (hex): "#002339FF"
+    Title Color (hex): "#F26C24FF"
+    Title Background (hex): "#00000000"
+  Shader Loading Dialog:
+    Allow custom background: true
+    Darkening effect strength: 30
+    Blur effect strength: 0
+Audio:
+  Renderer: Cubeb
+  Audio Provider: CellAudio
+  RSXAudio Avport: HDMI 0
+  Dump to file: false
+  Convert to 16 bit: false
+  Audio Format: Stereo
+  Audio Formats: 0
+  Audio Device: "@@@default@@@"
+  Master Volume: 100
+  Enable Buffering: true
+  Desired Audio Buffer Duration: 100
+  Enable Time Stretching: false
+  Disable Sampling Skip: false
+  Time Stretching Threshold: 75
+  Microphone Type: "Null"
+  Microphone Devices: "@@@@@@@@@@@@"
+  Music Handler: Qt
+Input/Output:
+  Keyboard: "Null"
+  Mouse: Basic
+  Camera: "Null"
+  Camera type: Unknown
+  Camera flip: None
+  Camera ID: Default
+  Move: "Null"
+  Buzz emulated controller: "Null"
+  Turntable emulated controller: "Null"
+  GHLtar emulated controller: "Null"
+  Pad handler mode: Single-threaded
+  Keep pads connected: false
+  Pad handler sleep (microseconds): 1000
+  Background input enabled: true
+  Show move cursor: false
+  Emulated Midi devices: Keyboardßßß@@@Keyboardßßß@@@Keyboardßßß@@@
+System:
+  License Area: SCEA
+  Language: English (US)
+  Keyboard Type: English keyboard (US standard)
+  Enter button assignment: Enter with cross
+  Console time offset (s): 0
+  PSID high: 0
+  PSID low: 0
+  HDD Model Name: ""
+  HDD Serial Number: ""
+Net:
+  Internet enabled: Disconnected
+  IP address: 0.0.0.0
+  Bind address: 0.0.0.0
+  DNS address: 8.8.8.8
+  IP swap list: ""
+  UPNP Enabled: false
+  PSN status: Disconnected
+Savestate:
+  Start Paused: false
+  Suspend Emulation Savestate Mode: false
+  Inspection Mode Savestates: false
+  Save Disc Game Data: false
+Miscellaneous:
+  Automatically start games after boot: true
+  Exit RPCS3 when process finishes: false
+  Start games in fullscreen mode: true
+  Prevent display sleep while running games: true
+  Show trophy popups: true
+  Show shader compilation hint: true
+  Use native user interface: true
+  GDB Server: 127.0.0.1:2345
+  Silence All Logs: false
+  Window Title Format: "FPS: %F | %R | %V | %T [%t]"
+  Pause Emulation During Home Menu: false
+Log: {}
\ No newline at end of file
diff --git a/configs/rpcs3/input_configs/active_profiles.yml b/configs/rpcs3/input_configs/active_profiles.yml
new file mode 100644
index 00000000..4f8b6181
--- /dev/null
+++ b/configs/rpcs3/input_configs/active_profiles.yml
@@ -0,0 +1,2 @@
+Active Profiles:
+  global: Default
\ No newline at end of file
diff --git a/configs/rpcs3/input_configs/global/Default.yml b/configs/rpcs3/input_configs/global/Default.yml
new file mode 100644
index 00000000..a3a2a1f0
--- /dev/null
+++ b/configs/rpcs3/input_configs/global/Default.yml
@@ -0,0 +1,539 @@
+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
+    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: "Null"
+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
+    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: "Null"
+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
+    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: "Null"
+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
+    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: "Null"
+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
+    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: "Null"
+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
+    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 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
+    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"
\ No newline at end of file
diff --git a/configs/rpcs3/vfs.yml b/configs/rpcs3/vfs.yml
new file mode 100644
index 00000000..172caab3
--- /dev/null
+++ b/configs/rpcs3/vfs.yml
@@ -0,0 +1,10 @@
+$(EmulatorDir): ""
+/dev_hdd0/: $(EmulatorDir)dev_hdd0/
+/dev_hdd1/: $(EmulatorDir)dev_hdd1/
+/dev_flash/: $(EmulatorDir)dev_flash/
+/dev_flash2/: $(EmulatorDir)dev_flash2/
+/dev_flash3/: $(EmulatorDir)dev_flash3/
+/dev_usb000/: $(EmulatorDir)dev_usb000/
+/dev_bdvd/: ""
+/app_home/: ""
+/games/: $(EmulatorDir)games/
\ No newline at end of file
diff --git a/configs/steam-rom-manager/userData/parsers/emudeck/sony-ps3-rpcs3-extracted_iso_psn.json b/configs/steam-rom-manager/userData/parsers/emudeck/sony-ps3-rpcs3-extracted_iso_psn.json
index 99d56568..1bbe3fe7 100644
--- a/configs/steam-rom-manager/userData/parsers/emudeck/sony-ps3-rpcs3-extracted_iso_psn.json
+++ b/configs/steam-rom-manager/userData/parsers/emudeck/sony-ps3-rpcs3-extracted_iso_psn.json
@@ -7,7 +7,7 @@
   "steamDirectory": "${steamdirglobal}",
   "startInDirectory": "",
   "titleModifier": "${fuzzyTitle}",
-  "executableArgs": "--no-gui \"${filePath}\"",
+  "executableArgs": "--no-gui \"'${filePath}'\"",
   "onlineImageQueries": "${${fuzzyTitle}}",
   "imagePool": "${fuzzyTitle}",
   "imageProviders": ["SteamGridDB"],
diff --git a/configs/steam-rom-manager/userData/parsers/emudeck/sony-ps3-rpcs3-pkg.json b/configs/steam-rom-manager/userData/parsers/emudeck/sony-ps3-rpcs3-pkg.json
index a9d5934d..f83b3183 100644
--- a/configs/steam-rom-manager/userData/parsers/emudeck/sony-ps3-rpcs3-pkg.json
+++ b/configs/steam-rom-manager/userData/parsers/emudeck/sony-ps3-rpcs3-pkg.json
@@ -4,7 +4,7 @@
   "steamCategory": "${PlayStation 3}",
   "steamDirectory": "${steamdirglobal}",
   "romDirectory": "/run/media/mmcblk0p1/Emulation/storage/rpcs3/dev_hdd0/game",
-  "executableArgs": "--no-gui \"${filePath}\"",
+  "executableArgs": "--no-gui \"'${filePath}'\"",
   "executableModifier": "\"${exePath}\"",
   "startInDirectory": "",
   "titleModifier": "${fuzzyTitle}",
diff --git a/functions/EmuScripts/emuDeckRPCS3.sh b/functions/EmuScripts/emuDeckRPCS3.sh
index 5a7b3b5c..81d0cb5b 100644
--- a/functions/EmuScripts/emuDeckRPCS3.sh
+++ b/functions/EmuScripts/emuDeckRPCS3.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 #variables
 RPCS3_remuName="RPCS3"
-RPCS3_emuType="FlatPak"
-RPCS3_emuPath="net.rpcs3.RPCS3"
-RPCS3_releaseURL=""
-RPCS3_VFSConf="$HOME/.var/app/${RPCS3_emuPath}/config/rpcs3/vfs.yml"
+RPCS3_emuType="AppImage"
+RPCS3_releaseURL="https://rpcs3.net/latest-appimage"
+RPCS3_emuPath="$HOME/Applications/rpcs3.AppImage"
+RPCS3_VFSConf="$HOME/.config/rpcs3/vfs.yml"
 
 #cleanupOlderThings
 RPCS3_cleanup(){
@@ -13,21 +13,49 @@ RPCS3_cleanup(){
 
 #Install
 RPCS3_install(){
-	installEmuFP "${RPCS3_remuName}" "${RPCS3_emuPath}"	
-	flatpak override "${RPCS3_emuPath}" --filesystem=host --user	
+	setMSG "Installing RPCS3"
+
+	# RPCS3 does not have a "latest" tag on their GitHub repo. Open issue said to use the below URL instead. Modified from ES-DE script
+	RPCS3_releaseMD5="$(curl -sL https://rpcs3.net/latest-appimage | md5sum | cut -d ' ' -f 1)"
+
+	local showProgress="$1"
+
+	if [[ $RPCS3_releaseURL = "https://rpcs3.net/latest-appimage"* ]]; then
+
+		if safeDownload "$RPCS3_remuName" "$RPCS3_releaseURL" "$RPCS3_emuPath" "$showProgress"; then
+			RPCS3_md5sum=($(md5sum $RPCS3_emuPath)) # get first element
+			if [ "$RPCS3_md5sum" == "$RPCS3_releaseMD5" ]; then
+				echo "RPCS3 PASSED HASH CHECK."
+				chmod +x "$RPCS3_emuPath"
+			else
+				echo "RPCS3 FAILED HASH CHECK. Expected $RPCS3_releaseMD5, got $RPCS3_md5sum"
+			fi
+		else
+			return 1
+		fi
+	else
+		setMSG "$RPCS3_remuName not found"
+		return 1
+	fi
+
+    # Preserve flatpak permissions for old RPCS3 Install
+	flatpak override net.rpcs3.RPCS3 --filesystem=host --user
+
 }
 
 #ApplyInitialSettings
 RPCS3_init(){
-	configEmuFP "${RPCS3_remuName}" "${RPCS3_emuPath}" "true"
+	configEmuAI "$RPCS3_emuName" "config" "$HOME/.config/rpcs3" "$EMUDECKGIT/configs/rpcs3" "true"
 	RPCS3_setupStorage
 	RPCS3_setEmulationFolder
 	RPCS3_setupSaves
+	RPCS3_createDesktopShortcut
+	
 }
 
 #update
 RPCS3_update(){
-	configEmuFP "${RPCS3_remuName}" "${RPCS3_emuPath}"
+	configEmuAI "$RPCS3_emuName" "config" "$HOME/.config/rpcs3" "$EMUDECKGIT/configs/rpcs3"
 	RPCS3_setupStorage
 	RPCS3_setEmulationFolder
 	RPCS3_setupSaves
@@ -50,46 +78,73 @@ RPCS3_setupStorage(){
 
 	mkdir -p "$storagePath/rpcs3/"
 
-	if [ ! -d "$storagePath"/rpcs3/dev_hdd0 ] && [ -d "$HOME/.var/app/${RPCS3_emuPath}/" ];then
-		echo "rpcs3 hdd does not exist in storagepath."
+	if [ ! -d "$storagePath"/rpcs3/dev_hdd0 ] && [ -d "$HOME/.var/app/net.rpcs3.RPCS3/config/rpcs3/" -o -d "$HOME/.config/rpcs3/" ]; then
+		echo "RPCS3 HDD does not exist in storage path"
 
 		echo -e ""
-		setMSG "Moving rpcs3 HDD to the Emulation/storage folder"			
+		setMSG "Moving RPCS3 HDD to the Emulation/storage folder"
 		echo -e ""
-		
-		mkdir -p "$storagePath/rpcs3" 
+
+		mkdir -p "$storagePath/rpcs3"
 
 		if [ -d "$savesPath/rpcs3/dev_hdd0" ]; then
 			mv -f "$savesPath"/rpcs3/dev_hdd0 "$storagePath"/rpcs3/
 
-		elif [ -d "$HOME/.var/app/${RPCS3_emuPath}/config/rpcs3/dev_hdd0" ]; then	
-			rsync -av "$HOME/.var/app/${RPCS3_emuPath}/config/rpcs3/dev_hdd0" "$storagePath"/rpcs3/ && rm -rf "$HOME/.var/app/${RPCS3_emuPath}/config/rpcs3/dev_hdd0"
+		elif [ -d "$HOME/.var/app/net.rpcs3.RPCS3/config/rpcs3/dev_hdd0" ]; then
+			rsync -av "$HOME/.var/app/net.rpcs3.RPCS3/config/rpcs3/dev_hdd0" "$storagePath"/rpcs3/ && rm -rf "$HOME/.var/app/net.rpcs3.RPCS3/config/rpcs3/dev_hdd0"
+
+		elif [ -d "$HOME/.config/rpcs3/dev_hdd0" ]; then
+			rsync -av "$HOME/.config/rpcs3/dev_hdd0" "$storagePath"/rpcs3/ && rm -rf "$HOME/.config/rpcs3/dev_hdd0"
 
 		fi
 	fi
 }
 
+# Create desktop shortcut
+RPCS3_createDesktopShortcut(){
+
+createDesktopShortcut   "$HOME/.local/share/applications/$RPCS3_remuName.desktop" \
+						"$RPCS3_remuName AppImage" \
+						"${toolsPath}/launchers/rpcs3.sh" \
+						"false"
+}
 
 #WipeSettings
 RPCS3_wipe(){
-   rm -rf "$HOME/.var/app/$RPCS3_emuPath"
-   # prob not cause roms are here
+	setMSG "Wiping $RPCS3_emuName settings."
+	rm -rf "$HOME/.config/rpcs3"
+	rm -rf "$HOME/.cache/rpcs3"
+
 }
 
 
 #Uninstall
 RPCS3_uninstall(){
-    flatpak uninstall "$RPCS3_emuPath" --user -y
+	setMSG "Uninstalling $RPCS3_emuName."
+	rm -rf "$RPCS3_emuPath"
+	RPCS3_wipe
 }
 
 #setABXYstyle
 RPCS3_setABXYstyle(){
- 	echo "NYI"   
+ 	echo "NYI"
 }
 
 #Migrate
 RPCS3_migrate(){
-  	echo "NYI"  
+   echo "Begin RPCS3 Migration"
+    emu="RPCS3"
+	migrationFlag="$HOME/emudeck/.${emu}MigrationCompleted"
+	#check if we have a nomigrateflag for $emu
+	if [ ! -f "$migrationFlag" ]; then
+		#RPCS3 flatpak to appimage
+		#From -- > to
+		migrationTable=()
+		migrationTable+=("$HOME/.var/app/net.rpcs3.RPCS3/config/rpcs3" "$HOME/.config/rpcs3")
+
+		migrateAndLinkConfig "$emu" "$migrationTable"
+	fi
+
 }
 
 #WideScreenOn
@@ -123,4 +178,4 @@ RPCS3_IsInstalled(){
 
 RPCS3_resetConfig(){
 	RPCS3_init &>/dev/null && echo "true" || echo "false"
-}
\ No newline at end of file
+}
diff --git a/icons/RPCS3.svg b/icons/RPCS3.svg
new file mode 100644
index 00000000..8ee8b5e0
--- /dev/null
+++ b/icons/RPCS3.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="4096.000000pt" height="4096.000000pt" viewBox="0 0 4096.000000 4096.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.16, written by Peter Selinger 2001-2019
+</metadata>
+<g transform="translate(0.000000,4096.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M1006 33960 c4 -4 -114 -29 -153 -32 -7 -1 -10 -5 -7 -9 7 -12 -42
+-23 -58 -13 -7 4 -10 4 -6 -1 7 -7 -54 -55 -71 -55 -5 0 -20 -9 -33 -20 -14
+-10 -29 -16 -34 -12 -5 4 -6 3 -2 -2 7 -8 -38 -51 -54 -51 -5 0 -7 -3 -5 -6 3
+-10 -34 -48 -45 -46 -6 1 -12 -6 -13 -16 -5 -26 -25 -48 -38 -40 -6 3 -7 1 -3
+-5 4 -7 3 -12 -1 -12 -5 0 -9 -9 -10 -19 -2 -24 -32 -71 -45 -71 -5 0 -6 -4
+-3 -10 3 -5 1 -10 -5 -10 -6 0 -8 -5 -5 -10 9 -15 -26 -101 -38 -93 -6 4 -8
+-4 -5 -21 3 -14 1 -26 -3 -26 -5 0 -9 -905 -9 -2011 0 -1120 4 -2008 9 -2005
+4 3 6 -6 3 -19 -3 -19 0 -25 13 -25 13 0 16 -6 13 -25 -3 -13 -2 -22 3 -20 10
+7 21 -28 14 -46 -3 -8 2 -23 11 -34 8 -11 12 -14 8 -6 -5 10 -3 12 5 7 7 -5
+10 -15 7 -23 -3 -8 -2 -11 3 -8 14 8 29 -24 23 -49 -3 -12 -1 -18 3 -13 11 10
+45 -22 45 -42 0 -21 90 -111 111 -111 20 0 51 -34 42 -45 -5 -4 1 -6 13 -3 25
+6 57 -9 49 -23 -3 -5 0 -6 8 -3 8 3 18 0 23 -7 5 -8 3 -10 -7 -5 -8 4 -5 1 5
+-8 10 -8 23 -13 28 -10 13 8 60 -5 54 -15 -3 -4 6 -6 19 -3 19 3 25 0 25 -13
+0 -13 6 -16 25 -13 13 3 22 2 20 -2 -3 -4 5669 -10 12603 -14 12003 -6 17527
+-17 17747 -36 216 -18 593 -101 817 -181 815 -286 1263 -840 1458 -1804 33
+-163 54 -330 44 -346 -3 -6 -1 -14 5 -18 40 -25 40 -1127 0 -1152 -6 -4 -8
+-12 -5 -18 16 -25 -38 -350 -91 -551 -104 -394 -242 -687 -446 -943 -165 -208
+-335 -348 -592 -490 -275 -152 -534 -235 -985 -317 -162 -30 -175 -31 -680
+-42 -372 -8 -4568 -11 -15150 -12 -10825 -1 -14638 -4 -14645 -12 -5 -6 -51
+-17 -102 -25 -53 -7 -91 -17 -90 -23 1 -6 -8 -11 -20 -10 -12 0 -20 -3 -17 -7
+5 -9 -28 -21 -47 -17 -7 2 -13 -4 -14 -12 0 -8 -8 -14 -18 -14 -9 1 -15 -1
+-13 -5 2 -3 -8 -15 -22 -25 -16 -12 -22 -14 -17 -5 4 8 -7 -3 -24 -23 -18 -21
+-36 -37 -41 -35 -4 1 -9 -2 -10 -8 -2 -16 -31 -44 -42 -42 -6 1 -12 -7 -14
+-17 -1 -11 -13 -29 -25 -40 -21 -20 -22 -20 -8 -1 13 19 13 19 -4 6 -10 -8
+-16 -19 -14 -25 6 -18 -34 -87 -46 -79 -6 4 -8 0 -4 -10 3 -9 1 -22 -6 -29 -7
+-7 -13 -26 -14 -43 -1 -16 -10 -35 -19 -42 -10 -7 -14 -20 -11 -33 3 -11 1
+-20 -4 -20 -5 0 -9 -813 -9 -1965 0 -1081 -1 -1969 -1 -1973 -5 -30 3 -82 11
+-77 6 3 7 -1 4 -9 -3 -9 2 -23 11 -32 9 -9 14 -25 12 -36 -3 -10 -1 -16 4 -13
+10 7 24 -40 15 -53 -3 -5 2 -18 10 -28 9 -10 13 -12 9 -4 -4 8 3 4 14 -10 11
+-14 21 -38 21 -53 0 -16 4 -26 9 -22 11 6 53 -44 46 -55 -2 -4 5 -16 18 -26
+l22 -19 -20 25 c-11 14 0 7 23 -15 44 -41 58 -62 19 -29 l-22 19 19 -22 c10
+-12 22 -21 26 -20 15 4 70 -44 64 -55 -5 -7 0 -9 13 -6 26 7 56 -9 47 -25 -4
+-7 -4 -9 0 -5 4 3 16 -2 27 -13 11 -11 24 -17 30 -13 14 8 61 -5 54 -15 -3 -5
+4 -7 15 -4 13 3 22 -1 26 -11 3 -9 18 -16 33 -17 14 0 6823 -5 15131 -10
+l15105 -9 135 -21 c742 -115 1179 -282 1546 -593 348 -295 606 -799 728 -1421
+32 -165 50 -301 42 -322 -4 -9 -2 -19 4 -23 40 -24 38 -1126 -2 -1151 -6 -4
+-7 -12 -4 -18 10 -15 -9 -169 -40 -321 -90 -452 -231 -804 -437 -1095 -271
+-381 -673 -639 -1227 -789 -198 -53 -437 -102 -448 -92 -3 3 -10 1 -17 -4 -6
+-5 -43 -14 -81 -20 -143 -22 -2096 -30 -5887 -24 -2674 5 -3821 4 -3825 -3 -5
+-8 -3103 -12 -10324 -14 -5674 -2 -10315 -7 -10312 -10 2 -4 -31 -10 -73 -14
+-58 -6 -83 -12 -97 -27 -11 -11 -26 -18 -37 -15 -11 3 -17 1 -13 -4 5 -9 -8
+-13 -37 -10 -9 1 -19 -8 -22 -20 -4 -15 -11 -20 -22 -15 -9 3 -14 2 -11 -3 5
+-8 -16 -23 -36 -25 -3 -1 -10 -5 -15 -10 -5 -5 -2 -6 7 -2 8 5 2 -3 -15 -17
+-16 -14 -33 -23 -36 -21 -4 2 -12 -3 -19 -11 -7 -8 -9 -15 -5 -15 4 0 2 -7 -5
+-15 -7 -8 -16 -13 -20 -10 -9 6 -23 -12 -27 -34 -1 -8 -12 -24 -24 -35 -21
+-20 -22 -20 -8 -1 13 18 13 19 -4 6 -9 -7 -17 -22 -17 -33 0 -20 -27 -78 -36
+-78 -3 0 -2 5 2 12 4 7 3 8 -5 4 -6 -4 -10 -13 -9 -19 4 -18 -23 -107 -35
+-114 -6 -4 -7 -1 -2 7 6 9 4 11 -4 5 -8 -4 -11 -20 -9 -36 3 -16 1 -29 -4 -29
+-11 0 -10 -3997 1 -4004 5 -4 7 -15 4 -26 -3 -11 -1 -20 4 -20 11 0 43 -77 46
+-109 0 -11 5 -17 11 -14 6 4 6 -1 2 -13 -4 -10 -4 -15 0 -11 11 11 43 -43 36
+-61 -3 -10 -1 -13 6 -8 7 4 21 -9 36 -31 25 -40 101 -117 133 -137 69 -41 92
+-59 86 -69 -3 -6 -1 -7 6 -3 6 4 22 1 34 -7 12 -7 35 -17 50 -21 15 -3 26 -10
+23 -14 -2 -4 14 -8 35 -9 22 0 47 -7 56 -15 19 -15 66 -15 18181 -8 6591 2
+11986 8 11988 12 3 4 157 8 342 8 375 0 703 12 962 35 94 8 176 12 182 9 6 -4
+13 -2 17 3 7 12 414 55 437 46 9 -3 19 -1 23 5 8 13 331 55 354 46 10 -3 17
+-2 17 4 0 5 17 12 38 15 505 74 1002 173 1378 273 52 14 98 23 103 19 5 -3 11
+-1 13 3 4 12 188 63 199 56 5 -3 9 -1 9 4 0 5 35 19 77 32 217 62 608 200 863
+303 189 77 186 75 400 172 129 58 515 255 598 304 26 15 115 68 197 117 608
+360 1156 817 1646 1374 181 206 395 494 559 755 45 72 86 129 92 127 5 -1 7 2
+4 7 -4 5 26 65 64 133 196 341 407 814 543 1218 150 447 274 977 347 1485 12
+82 26 153 32 156 6 4 8 11 4 17 -7 12 35 456 44 460 4 1 4 41 2 87 -3 47 0 91
+4 97 11 16 10 1465 -1 1491 -4 10 -5 56 -2 102 2 46 2 85 -2 87 -10 4 -52 438
+-44 451 3 5 1 12 -5 16 -6 3 -20 74 -31 156 -63 438 -187 990 -308 1370 -308
+965 -780 1796 -1396 2460 -62 66 -121 130 -131 143 l-19 22 94 97 c327 341
+603 716 874 1188 87 152 261 496 310 615 147 355 235 598 319 885 98 338 205
+835 256 1200 12 82 26 152 32 156 6 4 8 11 4 17 -7 12 36 456 45 460 3 1 4 38
+1 82 -2 43 -1 87 3 97 11 26 12 1475 1 1491 -4 6 -7 50 -4 97 2 46 2 86 -1 87
+-9 4 -52 448 -45 460 4 6 2 13 -4 17 -6 4 -22 85 -36 181 -56 385 -146 802
+-252 1170 -14 46 -22 91 -19 99 3 9 3 12 -1 8 -4 -4 -35 75 -69 175 -276 817
+-635 1477 -1149 2113 -195 241 -570 628 -801 826 -515 441 -1134 829 -1819
+1139 -231 105 -623 260 -818 325 -31 10 -54 23 -51 29 4 5 0 7 -9 4 -9 -4 -78
+14 -154 38 -200 64 -493 146 -689 194 -93 22 -204 49 -245 59 -41 11 -128 29
+-192 42 -65 12 -118 27 -118 31 0 5 -4 6 -10 3 -13 -8 -254 35 -261 47 -4 6
+-12 8 -17 4 -6 -4 -96 7 -199 23 -315 51 -951 133 -1248 161 -245 23 -703 30
+-2755 40 -2109 11 -28693 29 -28684 20z"/>
+</g>
+</svg>
diff --git a/tools/binupdate/binupdate.sh b/tools/binupdate/binupdate.sh
index 34dd39cc..cd762620 100644
--- a/tools/binupdate/binupdate.sh
+++ b/tools/binupdate/binupdate.sh
@@ -188,6 +188,16 @@ function runBinDownloads {
             messages+=("There was a problem updating Xenia")
         fi
     fi
+    if [[ "$binsToDL" == *"RPCS3"* ]]; then
+        ((progresspct += pct)) || true
+        echo "$progresspct"
+        echo "# Updating RPCS3"
+        if RPCS3_install "true" 2>&1; then
+            messages+=("RPCS3 Updated Successfully")
+        else
+            messages+=("There was a problem updating RPCS3")
+        fi
+    fi
     echo "100"
     echo "# Complete!"
 }
diff --git a/tools/launchers/rpcs3.sh b/tools/launchers/rpcs3.sh
index 758fc8bd..72a7e3bf 100644
--- a/tools/launchers/rpcs3.sh
+++ b/tools/launchers/rpcs3.sh
@@ -1,5 +1,31 @@
 #!/bin/sh
 source $HOME/.config/EmuDeck/backend/functions/all.sh
 cloud_sync_downloadEmu rpcs3
-/usr/bin/flatpak run net.rpcs3.RPCS3 "${@}"
-cloud_sync_uploadEmu rpcs3
\ No newline at end of file
+cloud_sync_uploadEmu rpcs3
+emuName="rpcs3" #parameterize me
+emufolder="$HOME/Applications" # has to be applications for ES-DE to find it
+
+#find full path to emu executable
+exe=$(find $emufolder -iname "${emuName}*.AppImage" | sort -n | cut -d' ' -f 2- | tail -n 1 2>/dev/null)
+
+#if appimage doesn't exist fall back to flatpak.
+if [[ $exe == '' ]]; then
+    #flatpak
+    flatpakApp=$(flatpak list --app --columns=application | grep $emuName)
+    exe="/usr/bin/flatpak run "$flatpakApp
+else
+#make sure that file is executable
+    chmod +x $exe
+fi
+
+#run the executable with the params.
+#Fix first '
+param="${@}"
+substituteWith='"'
+param=${param/\'/"$substituteWith"}
+#Fix last ' on command
+param=$(echo "$param" | sed 's/.$/"/')
+eval "${exe} ${param}"
+
+
+