diff --git a/automation_tools/automation_task_list.cfg b/automation_tools/automation_task_list.cfg
index a86dac82..e00e4a2c 100644
--- a/automation_tools/automation_task_list.cfg
+++ b/automation_tools/automation_task_list.cfg
@@ -28,3 +28,4 @@ hash^RETRODECKSHADPS4LATESTSTABLE^https://github.com/shadps4-emu/shadPS4/release
 
 #This will replace RETRODECKSHADPS4LATESTURL with the URL of the latest artifact and RETRODECKSHADPS4LATESTSHA with its SHA256 hash.
 #latestghaartifact^RETRODECKSHADPS4LATESTURL^RETRODECKSHADPS4LATESTSHA^https://github.com/shadps4-emu/shadPS4/actions/workflows/linux-qt.yml^shadps4-linux-qt
+hash^PORTMASTERLATESTSHA^https://github.com/PortsMaster/PortMaster-GUI/releases/latest/download/retrodeck.portmaster.zip
diff --git a/functions/run_game.sh b/functions/run_game.sh
index 8f084a05..27315fea 100755
--- a/functions/run_game.sh
+++ b/functions/run_game.sh
@@ -168,6 +168,7 @@ find_system_commands() {
 substitute_placeholders() {
     local cmd="$1"
     log d "Substitute placeholder: working on $cmd"
+    game=$(echo "$game" | sed "s/'/'\\\\''/g") # escaping internal '
     local rom_path="$game"
     local rom_dir=$(dirname "$rom_path")
     
@@ -193,6 +194,8 @@ substitute_placeholders() {
     cmd="${cmd//"%FILENAME%"/"'$file_name'"}"
     cmd="${cmd//"%ROMRAW%"/"'$rom_raw'"}"
     cmd="${cmd//"%ROMPATH%"/"'$rom_dir'"}"
+    cmd="${cmd//"%ENABLESHORTCUTS%"/""}"
+    cmd="${cmd//"%EMULATOR_OS-SHELL%"/"/bin/sh"}"
     
     # Ensure paths are quoted correctly
     cmd="${cmd//"%ROM%"/"'$rom_path'"}"
diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml
index 8f7cb9d2..e3fa85c2 100644
--- a/net.retrodeck.retrodeck.yml
+++ b/net.retrodeck.retrodeck.yml
@@ -615,8 +615,8 @@ modules:
       - cp PortMaster.zip "${FLATPAK_DEST}/retrodeck/PortMaster.zip"
     sources:
       - type: file
-        url: https://github.com/PortsMaster/PortMaster-GUI/releases/download/2024.09.13-1455/retrodeck.portmaster.zip
-        sha256: 4fe3ce3ffdc1d66fe235c8a1a6062a86aa06ee615dba1fe5fc6e9bdd75e9d39c
+        url: https://github.com/PortsMaster/PortMaster-GUI/releases/latest/download/retrodeck.portmaster.zip
+        sha256: PORTMASTERLATESTSHA
         dest-filename: PortMaster.zip
       - type: script
         commands:
@@ -644,10 +644,8 @@ modules:
     sources:
       # Testing the new feat/update-3.1.0
       - type: archive
-        url: https://github.com/RetroDECK/ES-DE/releases/download/feat%2Fupdate-3.1.0-170924.19/RetroDECK-ES-DE-Artifact.tar.gz
-        sha256: 047198f98d4c57fefb19bda059ec059ea2fb9691519952b86b744d21b57a00ff
-        #url: https://github.com/RetroDECK/ES-DE/releases/latest/download/RetroDECK-ES-DE-Artifact.tar.gz
-        #sha256: RETRODECKESDELATEST
+        url: https://github.com/RetroDECK/ES-DE/releases/latest/download/RetroDECK-ES-DE-Artifact.tar.gz
+        sha256: RETRODECKESDELATEST
 
   - name: retrodeck-theme
     buildsystem: simple