diff --git a/ports/hallowseve/Hallow's Eve.sh b/ports/hallowseve/Hallow's Eve.sh
index 8387f3657b..8dbe349851 100644
--- a/ports/hallowseve/Hallow's Eve.sh	
+++ b/ports/hallowseve/Hallow's Eve.sh	
@@ -13,22 +13,46 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/hallowseve"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
+export LIBGL_ES=2
+export LIBGL_GL=21
+export LIBGL_FB=4
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "hallowseve.gptk" & 
+$GPTOKEYB "$runtime" -c "hallowseve.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
\ No newline at end of file
diff --git a/ports/hallowseve/README.md b/ports/hallowseve/README.md
index fd5f5befa3..22f85e5d30 100644
--- a/ports/hallowseve/README.md
+++ b/ports/hallowseve/README.md
@@ -1,5 +1,5 @@
 ## Installation
-Buy the game from https://maxatrillionator.itch.io/hallows-eve and place the .solarus file in the hallowseve/game folder.
+Buy the game from https://maxatrillionator.itch.io/hallows-eve and place the .solarus file in the `ports/hallowseve` folder.
 
 ## Default Gameplay Controls
 | Button | Action |
diff --git a/ports/hallowseve/hallowseve/game/add .solarus file here b/ports/hallowseve/hallowseve/game/add .solarus file here
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ports/hallowseve/hallowseve/lib/liblua5.1.so.0 b/ports/hallowseve/hallowseve/lib/liblua5.1.so.0
deleted file mode 100644
index f99d953975..0000000000
Binary files a/ports/hallowseve/hallowseve/lib/liblua5.1.so.0 and /dev/null differ
diff --git a/ports/hallowseve/hallowseve/lib/libsolarus.so.1 b/ports/hallowseve/hallowseve/lib/libsolarus.so.1
deleted file mode 100644
index b75b9c47eb..0000000000
Binary files a/ports/hallowseve/hallowseve/lib/libsolarus.so.1 and /dev/null differ
diff --git a/ports/hallowseve/hallowseve/lib/libmodplug.so.1 b/ports/hallowseve/hallowseve/libs/libmodplug.so.1
similarity index 100%
rename from ports/hallowseve/hallowseve/lib/libmodplug.so.1
rename to ports/hallowseve/hallowseve/libs/libmodplug.so.1
diff --git a/ports/hallowseve/hallowseve/lib/libphysfs.so.1 b/ports/hallowseve/hallowseve/libs/libphysfs.so.1
similarity index 100%
rename from ports/hallowseve/hallowseve/lib/libphysfs.so.1
rename to ports/hallowseve/hallowseve/libs/libphysfs.so.1
diff --git a/ports/hallowseve/hallowseve/savedata/hallows-eve-saves/settings.dat b/ports/hallowseve/hallowseve/savedata/hallows-eve-saves/settings.dat
deleted file mode 100644
index d77e036514..0000000000
--- a/ports/hallowseve/hallowseve/savedata/hallows-eve-saves/settings.dat
+++ /dev/null
@@ -1,28 +0,0 @@
-fullscreen = true
-joypad_item_1 = ""
-joypad_item_2 = ""
-joypad_down = ""
-joypad_prev_item = ""
-sound_volume = 70
-keyboard_attack = "c"
-joypad_pause = ""
-joypad_right = ""
-custom_settings = true
-language = "en"
-joypad_left = ""
-keyboard_up = "up"
-joypad_up = ""
-keyboard_right = "right"
-joypad_next_item = ""
-keyboard_item_2 = "v"
-keyboard_prev_item = "f"
-joypad_attack = ""
-music_volume = 70
-joypad_action = ""
-keyboard_left = "left"
-joypad_enabled = false
-keyboard_pause = "d"
-keyboard_item_1 = "x"
-keyboard_next_item = "g"
-keyboard_action = "space"
-keyboard_down = "down"
\ No newline at end of file
diff --git a/ports/hallowseve/hallowseve/solarus-run b/ports/hallowseve/hallowseve/solarus-run
deleted file mode 100644
index 7e18402356..0000000000
Binary files a/ports/hallowseve/hallowseve/solarus-run and /dev/null differ
diff --git a/ports/hallowseve/port.json b/ports/hallowseve/port.json
index 74e61993a9..50149b310f 100644
--- a/ports/hallowseve/port.json
+++ b/ports/hallowseve/port.json
@@ -12,15 +12,15 @@
       "Jeod"
     ],
     "desc": "On Halloween, the barrier between human world and the spirit world thins. The spirits play tricks, the dead can be seen, and monsters can run their human world errands.\n\nSet in the 90s, play as Ichabod, a pumpkin man who uses his chance to enter the human world to try and rent Jurassic Park from the video store. Unfortunately, the only copy has been rented by a teen who’s brought a witch’s curse upon the town.\n\nGameplay is inspired by the classics and the modern classics — a Zeldalike sense of exploration, with the tight, fast combat of Hyper Light Drifter. All soaked in a charming pixel art atmosphere and a dumb sense of humor. Playtime is around 1-2 hours.",
-    "inst": "Buy the game from https://maxatrillionator.itch.io/hallows-eve and place the .solarus file in the hallowseve/game folder.",
+    "inst": "Buy the game from https://maxatrillionator.itch.io/hallows-eve and place the .solarus file in the ports/hallowseve folder.",
     "genres": [
       "action",
 	  "adventure"
     ],
-    "image": "hallowseve.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }
\ No newline at end of file
diff --git a/ports/oceansheart/Ocean's Heart.sh b/ports/oceansheart/Ocean's Heart.sh
index 420182ffd6..aacaedfc98 100644
--- a/ports/oceansheart/Ocean's Heart.sh	
+++ b/ports/oceansheart/Ocean's Heart.sh	
@@ -13,26 +13,46 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/oceansheart"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 export LIBGL_ES=2
 export LIBGL_GL=21
 export LIBGL_FB=4
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "oceansheart.gptk" & 
-SDL_GAMECONTROLLERCONFIG="$sdl_controllerconfig"
+$GPTOKEYB "$runtime" -c "oceansheart.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
\ No newline at end of file
diff --git a/ports/oceansheart/README.md b/ports/oceansheart/README.md
index 00c7ac5f6d..c7e790a441 100644
--- a/ports/oceansheart/README.md
+++ b/ports/oceansheart/README.md
@@ -1,5 +1,5 @@
 ## Installation
-Buy the game from GOG or Steam and place the data.solarus file in the oceansheart/game folder.
+Buy the game from GOG or Steam and place the data.solarus file in the `ports/oceansheart` folder.
 
 ## Default Gameplay Controls
 | Button | Action |
diff --git a/ports/oceansheart/oceansheart/game/add .solarus file here b/ports/oceansheart/oceansheart/game/add .solarus file here
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ports/oceansheart/oceansheart/lib/liblua5.1.so.0 b/ports/oceansheart/oceansheart/lib/liblua5.1.so.0
deleted file mode 100644
index f99d953975..0000000000
Binary files a/ports/oceansheart/oceansheart/lib/liblua5.1.so.0 and /dev/null differ
diff --git a/ports/oceansheart/oceansheart/lib/libsolarus.so.1 b/ports/oceansheart/oceansheart/lib/libsolarus.so.1
deleted file mode 100644
index b75b9c47eb..0000000000
Binary files a/ports/oceansheart/oceansheart/lib/libsolarus.so.1 and /dev/null differ
diff --git a/ports/oceansheart/oceansheart/lib/libEGL.so.1 b/ports/oceansheart/oceansheart/libs/libEGL.so.1
similarity index 100%
rename from ports/oceansheart/oceansheart/lib/libEGL.so.1
rename to ports/oceansheart/oceansheart/libs/libEGL.so.1
diff --git a/ports/oceansheart/oceansheart/lib/libGL.so.1 b/ports/oceansheart/oceansheart/libs/libGL.so.1
similarity index 100%
rename from ports/oceansheart/oceansheart/lib/libGL.so.1
rename to ports/oceansheart/oceansheart/libs/libGL.so.1
diff --git a/ports/oceansheart/oceansheart/lib/libGLU.so.1 b/ports/oceansheart/oceansheart/libs/libGLU.so.1
similarity index 100%
rename from ports/oceansheart/oceansheart/lib/libGLU.so.1
rename to ports/oceansheart/oceansheart/libs/libGLU.so.1
diff --git a/ports/oceansheart/oceansheart/lib/libmodplug.so.1 b/ports/oceansheart/oceansheart/libs/libmodplug.so.1
similarity index 100%
rename from ports/oceansheart/oceansheart/lib/libmodplug.so.1
rename to ports/oceansheart/oceansheart/libs/libmodplug.so.1
diff --git a/ports/oceansheart/oceansheart/lib/libphysfs.so.1 b/ports/oceansheart/oceansheart/libs/libphysfs.so.1
similarity index 100%
rename from ports/oceansheart/oceansheart/lib/libphysfs.so.1
rename to ports/oceansheart/oceansheart/libs/libphysfs.so.1
diff --git a/ports/oceansheart/oceansheart/savedata/oceans_heart_saves/scripts/fx/swipe_fade.lua b/ports/oceansheart/oceansheart/oceans_heart_saves/scripts/fx/swipe_fade.lua
similarity index 100%
rename from ports/oceansheart/oceansheart/savedata/oceans_heart_saves/scripts/fx/swipe_fade.lua
rename to ports/oceansheart/oceansheart/oceans_heart_saves/scripts/fx/swipe_fade.lua
diff --git a/ports/oceansheart/oceansheart/solarus-run b/ports/oceansheart/oceansheart/solarus-run
deleted file mode 100644
index 7e18402356..0000000000
Binary files a/ports/oceansheart/oceansheart/solarus-run and /dev/null differ
diff --git a/ports/oceansheart/port.json b/ports/oceansheart/port.json
index e57de69df7..3b8b2f110a 100644
--- a/ports/oceansheart/port.json
+++ b/ports/oceansheart/port.json
@@ -12,15 +12,15 @@
       "Jeod"
     ],
     "desc": "When pirates attacked Limestone Island, it fell to Tilia’s father to go after them and rescue the young woman they kidnapped. When he hasn’t returned six months later, Tilia decides it’s up to her to track down her dad and find out what went wrong.\n\nPlay as Tilia as she travels across an archipelago full of pirate forts, forgotten magic, abominable beasts, and a diverse cast of people trying to find their place in it all. As Tilia follows her dad’s trail, she becomes entrangled in the pirates’ plot to use an old magic to control the ocean. And maybe along the way, she’ll play in a tick-tack-toe championship, prevent an art heist, or impresonate a piano tuner. It’s a large world full of secrets, dangers, and quirky wierdos for you to explore.",
-    "inst": "Buy the game from GOG or Steam and place the data.solarus file in the oceansheart/game folder.",
+    "inst": "Buy the game from GOG or Steam and place the data.solarus file in the ports/oceansheart folder.",
     "genres": [
       "action",
 	  "adventure"
     ],
-    "image": "oceansheart.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }
\ No newline at end of file
diff --git a/ports/stop_the_eggspress/port.json b/ports/stop_the_eggspress/port.json
index fda2390f1e..47a7decfa9 100644
--- a/ports/stop_the_eggspress/port.json
+++ b/ports/stop_the_eggspress/port.json
@@ -2,7 +2,7 @@
   "version": 2,
   "name": "stop_the_eggspress.zip",
   "items": [
-    "Stop The Egg Eggspress.sh",
+    "Stop The Eggspress.sh",
     "stop_the_eggspress"
   ],
   "items_opt": [],
diff --git a/ports/tunics/README.md b/ports/tunics/README.md
index 7b2be547f2..c83df450d3 100644
--- a/ports/tunics/README.md
+++ b/ports/tunics/README.md
@@ -1,5 +1,5 @@
 ## Installation
-Download game from https://solarus-games.org/games/tunics/ and put the .solarus file in tunics!/game.
+Download game from https://solarus-games.org/games/tunics/ and put the .solarus file in `ports/tunics`.
 
 ## Default Gameplay Controls
 | Button | Action |
diff --git a/ports/tunics/Tunics!.sh b/ports/tunics/Tunics!.sh
index 4a5c040fe1..bed7e12cc8 100644
--- a/ports/tunics/Tunics!.sh
+++ b/ports/tunics/Tunics!.sh
@@ -13,22 +13,43 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/tunics"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "tunics.gptk" & 
+$GPTOKEYB "$runtime" -c "tunics.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
\ No newline at end of file
diff --git a/ports/tunics/port.json b/ports/tunics/port.json
index 3d2918ae0f..db0360f9ad 100644
--- a/ports/tunics/port.json
+++ b/ports/tunics/port.json
@@ -1,9 +1,9 @@
 {
   "version": 2,
-  "name": "tunics.zip",
+  "name": "tunics!.zip",
   "items": [
     "Tunics!.sh",
-    "tunics/"
+    "tunics!/"
   ],
   "items_opt": [],
   "attr": {
@@ -12,7 +12,7 @@
       "Jeod"
     ],
     "desc": "Tunics! is a Rogue-like Legend of Zelda quest. It means it’s only dungeons, and they are randomly generated. Moreover, once you’re dead, you’ll have to restart from the beginning, losing all your improvements (weapons, health, etc). It should be considered a well-polished proof-of-concept.",
-    "inst": "Download game from https://solarus-games.org/games/tunics/ and put the .solarus file in tunics!/game.",
+    "inst": "Download game from https://solarus-games.org/games/tunics/ and put the .solarus file in the ports/tunics folder.",
     "genres": [
       "action",
 	  "adventure"
@@ -20,7 +20,7 @@
     "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }
\ No newline at end of file
diff --git a/ports/tunics/tunics/game/add .solarus file here b/ports/tunics/tunics/game/add .solarus file here
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ports/tunics/tunics/lib/liblua5.1.so.0 b/ports/tunics/tunics/lib/liblua5.1.so.0
deleted file mode 100644
index f99d953975..0000000000
Binary files a/ports/tunics/tunics/lib/liblua5.1.so.0 and /dev/null differ
diff --git a/ports/tunics/tunics/lib/libsolarus.so.1 b/ports/tunics/tunics/lib/libsolarus.so.1
deleted file mode 100644
index b75b9c47eb..0000000000
Binary files a/ports/tunics/tunics/lib/libsolarus.so.1 and /dev/null differ
diff --git a/ports/tunics/tunics/lib/libmodplug.so.1 b/ports/tunics/tunics/libs/libmodplug.so.1
similarity index 100%
rename from ports/tunics/tunics/lib/libmodplug.so.1
rename to ports/tunics/tunics/libs/libmodplug.so.1
diff --git a/ports/tunics/tunics/lib/libphysfs.so.1 b/ports/tunics/tunics/libs/libphysfs.so.1
similarity index 100%
rename from ports/tunics/tunics/lib/libphysfs.so.1
rename to ports/tunics/tunics/libs/libphysfs.so.1
diff --git a/ports/tunics/tunics/solarus-run b/ports/tunics/tunics/solarus-run
deleted file mode 100644
index 7e18402356..0000000000
Binary files a/ports/tunics/tunics/solarus-run and /dev/null differ
diff --git a/ports/yarntown/README.md b/ports/yarntown/README.md
index c6cb0910a2..f4d3d9f5f2 100644
--- a/ports/yarntown/README.md
+++ b/ports/yarntown/README.md
@@ -1,5 +1,5 @@
 ## Installation
-Download game from https://solarus-games.org/games/yarntown/ and put the .solarus file in yarntown/game.
+Download game from https://solarus-games.org/games/yarntown/ and put the .solarus file in `ports/yarntown`.
 
 ## Default Gameplay Controls
 | Button | Action |
@@ -12,9 +12,6 @@ Download game from https://solarus-games.org/games/yarntown/ and put the .solaru
 |Y|Heal|
 |START|Pause & Save|
 
-## Notes
-This game will boot ok RK3326 chips, but performance will be low in Central Yarntown. It's still somewhat playable, but nowhere near smooth. Play at your own risk.
-
 ## Thanks
 Cebion  
 Max Mraz  
diff --git a/ports/yarntown/Yarntown.sh b/ports/yarntown/Yarntown.sh
index 4c414afa9a..5f31e97865 100644
--- a/ports/yarntown/Yarntown.sh
+++ b/ports/yarntown/Yarntown.sh
@@ -13,22 +13,43 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/yarntown"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "yarntown.gptk" & 
+$GPTOKEYB "$runtime" -c "yarntown.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
\ No newline at end of file
diff --git a/ports/yarntown/port.json b/ports/yarntown/port.json
index 77feb9a2b2..f98a8cb7dc 100644
--- a/ports/yarntown/port.json
+++ b/ports/yarntown/port.json
@@ -9,19 +9,17 @@
   "attr": {
     "title": "Yarntown",
     "porter": [
-      "Jeod"
+      "Jeod",
     ],
     "desc": "You’ve come on the night of the hunt. The streets of this cursed, gothic town are overrun with beasts, and what has become of the men who tried to hunt them before. Explore the twisting roads, go toe to toe with powerful foes, and uncover Yarntown’s dark secrets.",
-    "inst": "Download game from https://solarus-games.org/games/yarntown/ and put the .solarus file in yarntown/game.",
+    "inst": "Download game from https://solarus-games.org/games/yarntown/ and put the .solarus file in ports/yarntown.",
     "genres": [
-      "action"
+      "action",
     ],
-    "image": "yarntown.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
-    "reqs": [
-		"power"
-	]
+    "runtime": "solarus-1.6.5",
+    "reqs": []
   }
 }
\ No newline at end of file
diff --git a/ports/yarntown/yarntown/game/add .solarus file here b/ports/yarntown/yarntown/game/add .solarus file here
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ports/yarntown/yarntown/lib/liblua5.1.so.0 b/ports/yarntown/yarntown/lib/liblua5.1.so.0
deleted file mode 100644
index f99d953975..0000000000
Binary files a/ports/yarntown/yarntown/lib/liblua5.1.so.0 and /dev/null differ
diff --git a/ports/yarntown/yarntown/lib/libsolarus.so.1 b/ports/yarntown/yarntown/lib/libsolarus.so.1
deleted file mode 100644
index b75b9c47eb..0000000000
Binary files a/ports/yarntown/yarntown/lib/libsolarus.so.1 and /dev/null differ
diff --git a/ports/yarntown/yarntown/lib/libmodplug.so.1 b/ports/yarntown/yarntown/libs/libmodplug.so.1
similarity index 100%
rename from ports/yarntown/yarntown/lib/libmodplug.so.1
rename to ports/yarntown/yarntown/libs/libmodplug.so.1
diff --git a/ports/yarntown/yarntown/lib/libphysfs.so.1 b/ports/yarntown/yarntown/libs/libphysfs.so.1
similarity index 100%
rename from ports/yarntown/yarntown/lib/libphysfs.so.1
rename to ports/yarntown/yarntown/libs/libphysfs.so.1
diff --git a/ports/yarntown/yarntown/savedata/yarntown_saves/settings.dat b/ports/yarntown/yarntown/savedata/yarntown_saves/settings.dat
deleted file mode 100644
index ce2d724006..0000000000
--- a/ports/yarntown/yarntown/savedata/yarntown_saves/settings.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-video_mode = "normal"
-fullscreen = false
-sound_volume = 100
-music_volume = 100
-joypad_enabled = false
diff --git a/ports/yarntown/yarntown/solarus-run b/ports/yarntown/yarntown/solarus-run
deleted file mode 100644
index 7e18402356..0000000000
Binary files a/ports/yarntown/yarntown/solarus-run and /dev/null differ
diff --git a/ports/zelda-bookofmudora/README.md b/ports/zelda-bookofmudora/README.md
index 7deb89c5ea..90d51152e9 100644
--- a/ports/zelda-bookofmudora/README.md
+++ b/ports/zelda-bookofmudora/README.md
@@ -1,5 +1,5 @@
 ## Installation
-Download the game from https://solarus-games.org/games/the-legend-of-zelda-book-of-mudora/ and put in the zelda-bookofmudora/game folder.
+Download the game from https://solarus-games.org/games/the-legend-of-zelda-book-of-mudora/ and put in the `ports/zelda-bookofmudora` folder.
 
 ## Default Gameplay Controls
 | Button | Action |
diff --git a/ports/zelda-bookofmudora/The Legend of Zelda - Book of Mudora.sh b/ports/zelda-bookofmudora/The Legend of Zelda - Book of Mudora.sh
index ef119bd84e..065780f9d5 100644
--- a/ports/zelda-bookofmudora/The Legend of Zelda - Book of Mudora.sh	
+++ b/ports/zelda-bookofmudora/The Legend of Zelda - Book of Mudora.sh	
@@ -13,22 +13,43 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/zelda-bookofmudora"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "zbom.gptk" & 
+$GPTOKEYB "$runtime" -c "zbom.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
\ No newline at end of file
diff --git a/ports/zelda-bookofmudora/port.json b/ports/zelda-bookofmudora/port.json
index 58b9b2a004..55d3036b13 100644
--- a/ports/zelda-bookofmudora/port.json
+++ b/ports/zelda-bookofmudora/port.json
@@ -12,15 +12,15 @@
       "Jeod"
     ],
     "desc": "Link’s newest quest is set a few generations after Twilight Princess and spans two different continents of Hyrule. Explore eight unique temples and defeat enemies and bosses in order to gain powerful items to assist you in your goal. Explore many areas of Hyrule and assist different races in their conflicts.",
-    "inst": "Download the game from https://solarus-games.org/games/the-legend-of-zelda-book-of-mudora/ and put in the zelda-bookofmudora/game folder.",
+    "inst": "Download the game from https://solarus-games.org/games/the-legend-of-zelda-book-of-mudora/ and put in the ports/zelda-bookofmudora folder.",
     "genres": [
       "action",
 	  "adventure"
     ],
-    "image": "zelda-bookofmudora.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }
\ No newline at end of file
diff --git a/ports/zelda-bookofmudora/zelda-bookofmudora/game/add .solarus file here b/ports/zelda-bookofmudora/zelda-bookofmudora/game/add .solarus file here
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ports/zelda-bookofmudora/zelda-bookofmudora/lib/liblua5.1.so.0 b/ports/zelda-bookofmudora/zelda-bookofmudora/lib/liblua5.1.so.0
deleted file mode 100644
index f99d953975..0000000000
Binary files a/ports/zelda-bookofmudora/zelda-bookofmudora/lib/liblua5.1.so.0 and /dev/null differ
diff --git a/ports/zelda-bookofmudora/zelda-bookofmudora/lib/libsolarus.so.1 b/ports/zelda-bookofmudora/zelda-bookofmudora/lib/libsolarus.so.1
deleted file mode 100644
index b75b9c47eb..0000000000
Binary files a/ports/zelda-bookofmudora/zelda-bookofmudora/lib/libsolarus.so.1 and /dev/null differ
diff --git a/ports/zelda-bookofmudora/zelda-bookofmudora/lib/libmodplug.so.1 b/ports/zelda-bookofmudora/zelda-bookofmudora/libs/libmodplug.so.1
similarity index 100%
rename from ports/zelda-bookofmudora/zelda-bookofmudora/lib/libmodplug.so.1
rename to ports/zelda-bookofmudora/zelda-bookofmudora/libs/libmodplug.so.1
diff --git a/ports/zelda-bookofmudora/zelda-bookofmudora/lib/libphysfs.so.1 b/ports/zelda-bookofmudora/zelda-bookofmudora/libs/libphysfs.so.1
similarity index 100%
rename from ports/zelda-bookofmudora/zelda-bookofmudora/lib/libphysfs.so.1
rename to ports/zelda-bookofmudora/zelda-bookofmudora/libs/libphysfs.so.1
diff --git a/ports/zelda-bookofmudora/zelda-bookofmudora/savedata/zbom/settings.dat b/ports/zelda-bookofmudora/zelda-bookofmudora/savedata/zbom/settings.dat
deleted file mode 100644
index ce2d724006..0000000000
--- a/ports/zelda-bookofmudora/zelda-bookofmudora/savedata/zbom/settings.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-video_mode = "normal"
-fullscreen = false
-sound_volume = 100
-music_volume = 100
-joypad_enabled = false
diff --git a/ports/zelda-bookofmudora/zelda-bookofmudora/solarus-run b/ports/zelda-bookofmudora/zelda-bookofmudora/solarus-run
deleted file mode 100644
index 7e18402356..0000000000
Binary files a/ports/zelda-bookofmudora/zelda-bookofmudora/solarus-run and /dev/null differ
diff --git a/ports/zelda-mysteryofsolarusdx/README.md b/ports/zelda-mysteryofsolarusdx/README.md
index fb2b4d3f9e..30a5b7147c 100644
--- a/ports/zelda-mysteryofsolarusdx/README.md
+++ b/ports/zelda-mysteryofsolarusdx/README.md
@@ -1,5 +1,5 @@
 ## Installation
-Download the game from https://solarus-games.org/games/the-legend-of-zelda-mystery-of-solarus-dx/ and put in the zelda-mysteryofsolarus/game folder.
+Download the game from https://solarus-games.org/games/the-legend-of-zelda-mystery-of-solarus-dx/ and put in the `ports/zelda-mysteryofsolarusdx` folder.
 
 ## Default Gameplay Controls
 | Button | Action |
diff --git a/ports/zelda-mysteryofsolarusdx/The Legend of Zelda - Mystery of Solarus DX.sh b/ports/zelda-mysteryofsolarusdx/The Legend of Zelda - Mystery of Solarus DX.sh
index 3fba51d92e..a9208adfbf 100644
--- a/ports/zelda-mysteryofsolarusdx/The Legend of Zelda - Mystery of Solarus DX.sh	
+++ b/ports/zelda-mysteryofsolarusdx/The Legend of Zelda - Mystery of Solarus DX.sh	
@@ -13,22 +13,43 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/zelda-mysteryofsolarusdx"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "zmos.gptk" & 
+$GPTOKEYB "$runtime" -c "zmos.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
\ No newline at end of file
diff --git a/ports/zelda-mysteryofsolarusdx/port.json b/ports/zelda-mysteryofsolarusdx/port.json
index 902f23ad77..5b572a79ff 100644
--- a/ports/zelda-mysteryofsolarusdx/port.json
+++ b/ports/zelda-mysteryofsolarusdx/port.json
@@ -12,15 +12,15 @@
       "Jeod"
     ],
     "desc": "The Legend of Zelda: Mystery of Solarus DX is set to be a direct sequel to The Legend of Zelda: A Link to the Past on SNES, using the same graphics and game mechanisms. Mystery of Solarus DX was the first game made with the Solarus engine and in fact, Solarus was primarily designed for this game.",
-    "inst": "Download the game from https://solarus-games.org/games/the-legend-of-zelda-mystery-of-solarus-dx/ and put in the zelda-mysteryofsolarus/game folder.",
+    "inst": "Download the game from https://solarus-games.org/games/the-legend-of-zelda-mystery-of-solarus-dx/ and put in the ports/zelda-mysteryofsolarus folder.",
     "genres": [
       "action",
 	  "adventure"
     ],
-    "image": "zelda-mysteryofsolarusdx.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }
\ No newline at end of file
diff --git a/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/game/add .solarus file here b/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/game/add .solarus file here
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/lib/liblua5.1.so.0 b/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/lib/liblua5.1.so.0
deleted file mode 100644
index f99d953975..0000000000
Binary files a/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/lib/liblua5.1.so.0 and /dev/null differ
diff --git a/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/lib/libsolarus.so.1 b/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/lib/libsolarus.so.1
deleted file mode 100644
index b75b9c47eb..0000000000
Binary files a/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/lib/libsolarus.so.1 and /dev/null differ
diff --git a/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/lib/libmodplug.so.1 b/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/libs/libmodplug.so.1
similarity index 100%
rename from ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/lib/libmodplug.so.1
rename to ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/libs/libmodplug.so.1
diff --git a/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/lib/libphysfs.so.1 b/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/libs/libphysfs.so.1
similarity index 100%
rename from ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/lib/libphysfs.so.1
rename to ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/libs/libphysfs.so.1
diff --git a/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/savedata/zsdx/settings.dat b/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/savedata/zsdx/settings.dat
deleted file mode 100644
index ff9e36ddc3..0000000000
--- a/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/savedata/zsdx/settings.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-video_mode = "normal"
-fullscreen = true
-sound_volume = 100
-music_volume = 100
-joypad_enabled = false
diff --git a/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/solarus-run b/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/solarus-run
deleted file mode 100644
index 7e18402356..0000000000
Binary files a/ports/zelda-mysteryofsolarusdx/zelda-mysteryofsolarusdx/solarus-run and /dev/null differ
diff --git a/ports/zelda-mysteryofsolarusxd/README.md b/ports/zelda-mysteryofsolarusxd/README.md
index b851150552..0a0e685835 100644
--- a/ports/zelda-mysteryofsolarusxd/README.md
+++ b/ports/zelda-mysteryofsolarusxd/README.md
@@ -1,5 +1,5 @@
 ## Installation
-Download the game from https://solarus-games.org/games/the-legend-of-zelda-mystery-of-solarus-xd/ and put in the zelda-mysteryofsolarusxd/game folder.
+Download the game from https://solarus-games.org/games/the-legend-of-zelda-mystery-of-solarus-xd/ and put in the `ports/zelda-mysteryofsolarusxd` folder.
 
 ## Default Gameplay Controls
 | Button | Action |
diff --git a/ports/zelda-mysteryofsolarusxd/The Legend of Zelda - Mystery of Solarus XD.sh b/ports/zelda-mysteryofsolarusxd/The Legend of Zelda - Mystery of Solarus XD.sh
index 48ba4c6622..4e58783231 100644
--- a/ports/zelda-mysteryofsolarusxd/The Legend of Zelda - Mystery of Solarus XD.sh	
+++ b/ports/zelda-mysteryofsolarusxd/The Legend of Zelda - Mystery of Solarus XD.sh	
@@ -13,22 +13,43 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/zelda-mysteryofsolarusxd"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "zmosxd.gptk" & 
+$GPTOKEYB "$runtime" -c "zmosxd.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
\ No newline at end of file
diff --git a/ports/zelda-mysteryofsolarusxd/port.json b/ports/zelda-mysteryofsolarusxd/port.json
index e6b96e40d9..592695c6dd 100644
--- a/ports/zelda-mysteryofsolarusxd/port.json
+++ b/ports/zelda-mysteryofsolarusxd/port.json
@@ -12,15 +12,15 @@
       "Jeod"
     ],
     "desc": "The Legend of Zelda: Mystery of Solarus XD is a parodic game that we released on April 1st, 2011. Though it’s a big April 1st joke, it’s a real, full game with two huge dungeons and 5-10 hours of playing.\n\nIt was developed in a very short period of time, thanks to coffee, beer and pizzas. Though the development has been rushed to ship on time, the game is complete, with lots of jokes, references and quirky NPCs.",
-    "inst": "Download the game from https://solarus-games.org/games/the-legend-of-zelda-mystery-of-solarus-xd/ and put in the zelda-mysteryofsolarusxd/game folder.",
+    "inst": "Download the game from https://solarus-games.org/games/the-legend-of-zelda-mystery-of-solarus-xd/ and put in the ports/zelda-mysteryofsolarusxd folder.",
     "genres": [
       "action",
 	  "adventure"
     ],
-    "image": "zelda-mysteryofsolarusxd.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }
\ No newline at end of file
diff --git a/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/game/add .solarus file here b/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/game/add .solarus file here
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/lib/liblua5.1.so.0 b/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/lib/liblua5.1.so.0
deleted file mode 100644
index f99d953975..0000000000
Binary files a/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/lib/liblua5.1.so.0 and /dev/null differ
diff --git a/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/lib/libsolarus.so.1 b/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/lib/libsolarus.so.1
deleted file mode 100644
index b75b9c47eb..0000000000
Binary files a/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/lib/libsolarus.so.1 and /dev/null differ
diff --git a/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/lib/libmodplug.so.1 b/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/libs/libmodplug.so.1
similarity index 100%
rename from ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/lib/libmodplug.so.1
rename to ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/libs/libmodplug.so.1
diff --git a/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/lib/libphysfs.so.1 b/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/libs/libphysfs.so.1
similarity index 100%
rename from ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/lib/libphysfs.so.1
rename to ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/libs/libphysfs.so.1
diff --git a/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/savedata/zsxd/settings.dat b/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/savedata/zsxd/settings.dat
deleted file mode 100644
index ff9e36ddc3..0000000000
--- a/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/savedata/zsxd/settings.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-video_mode = "normal"
-fullscreen = true
-sound_volume = 100
-music_volume = 100
-joypad_enabled = false
diff --git a/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/solarus-run b/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/solarus-run
deleted file mode 100644
index 7e18402356..0000000000
Binary files a/ports/zelda-mysteryofsolarusxd/zelda-mysteryofsolarusxd/solarus-run and /dev/null differ
diff --git a/ports/zelda-roth-se/README.md b/ports/zelda-roth-se/README.md
index 2d5de0e57a..c6acff1b94 100644
--- a/ports/zelda-roth-se/README.md
+++ b/ports/zelda-roth-se/README.md
@@ -1,5 +1,5 @@
 ## Installation
-Download the game from https://solarus-games.org/games/the-legend-of-zelda-return-of-the-hylian-se/ and put in the zelda-roth-se/game folder.
+Download the game from https://solarus-games.org/games/the-legend-of-zelda-return-of-the-hylian-se/ and put in the `ports/zelda-roth-se` folder.
 
 ## Default Gameplay Controls
 | Button | Action |
diff --git a/ports/zelda-roth-se/The Legend of Zelda - Return of the Hylian.sh b/ports/zelda-roth-se/The Legend of Zelda - Return of the Hylian.sh
index a6328fa6c2..ab80300459 100644
--- a/ports/zelda-roth-se/The Legend of Zelda - Return of the Hylian.sh	
+++ b/ports/zelda-roth-se/The Legend of Zelda - Return of the Hylian.sh	
@@ -13,22 +13,43 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/zelda-roth-se"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "zroth.gptk" & 
+$GPTOKEYB "$runtime" -c "zroth.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
\ No newline at end of file
diff --git a/ports/zelda-roth-se/port.json b/ports/zelda-roth-se/port.json
index 88b9837dd6..6376a3f211 100644
--- a/ports/zelda-roth-se/port.json
+++ b/ports/zelda-roth-se/port.json
@@ -12,15 +12,15 @@
       "Jeod"
     ],
     "desc": "After Link’s victory over Ganon in A Link to the Past, no one knows what Link’s wish to the Triforce was. But this wish reunified the Light World and the Dark World and brought the Seven Wise Men’s descendants back to life. Peace was back in Hyrule. But unfortunately, this wish also ressurected Ganon and his henchmen. He was preparing his revenge, but he couldn’t do anything without the Triforce.\n\nOne night, a familiar voice speaks to Link in his sleep…",
-    "inst": "Download the game from https://solarus-games.org/games/the-legend-of-zelda-return-of-the-hylian-se/ and put in the zelda-roth-se/game folder.",
+    "inst": "Download the game from https://solarus-games.org/games/the-legend-of-zelda-return-of-the-hylian-se/ and put in the ports/zelda-roth-sefolder.",
     "genres": [
       "action",
 	  "adventure"
     ],
-    "image": "zelda-roth-se.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }
\ No newline at end of file
diff --git a/ports/zelda-roth-se/zelda-roth-se/game/add .solarus file here b/ports/zelda-roth-se/zelda-roth-se/game/add .solarus file here
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ports/zelda-roth-se/zelda-roth-se/lib/liblua5.1.so.0 b/ports/zelda-roth-se/zelda-roth-se/lib/liblua5.1.so.0
deleted file mode 100644
index f99d953975..0000000000
Binary files a/ports/zelda-roth-se/zelda-roth-se/lib/liblua5.1.so.0 and /dev/null differ
diff --git a/ports/zelda-roth-se/zelda-roth-se/lib/libsolarus.so.1 b/ports/zelda-roth-se/zelda-roth-se/lib/libsolarus.so.1
deleted file mode 100644
index b75b9c47eb..0000000000
Binary files a/ports/zelda-roth-se/zelda-roth-se/lib/libsolarus.so.1 and /dev/null differ
diff --git a/ports/zelda-roth-se/zelda-roth-se/lib/libmodplug.so.1 b/ports/zelda-roth-se/zelda-roth-se/libs/libmodplug.so.1
similarity index 100%
rename from ports/zelda-roth-se/zelda-roth-se/lib/libmodplug.so.1
rename to ports/zelda-roth-se/zelda-roth-se/libs/libmodplug.so.1
diff --git a/ports/zelda-roth-se/zelda-roth-se/lib/libphysfs.so.1 b/ports/zelda-roth-se/zelda-roth-se/libs/libphysfs.so.1
similarity index 100%
rename from ports/zelda-roth-se/zelda-roth-se/lib/libphysfs.so.1
rename to ports/zelda-roth-se/zelda-roth-se/libs/libphysfs.so.1
diff --git a/ports/zelda-roth-se/zelda-roth-se/savedata/zelda_roth_se/settings.dat b/ports/zelda-roth-se/zelda-roth-se/savedata/zelda_roth_se/settings.dat
deleted file mode 100644
index ff9e36ddc3..0000000000
--- a/ports/zelda-roth-se/zelda-roth-se/savedata/zelda_roth_se/settings.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-video_mode = "normal"
-fullscreen = true
-sound_volume = 100
-music_volume = 100
-joypad_enabled = false
diff --git a/ports/zelda-roth-se/zelda-roth-se/solarus-run b/ports/zelda-roth-se/zelda-roth-se/solarus-run
deleted file mode 100644
index 7e18402356..0000000000
Binary files a/ports/zelda-roth-se/zelda-roth-se/solarus-run and /dev/null differ
diff --git a/ports/zeldaxd-mercurischess/README.md b/ports/zeldaxd-mercurischess/README.md
index 5c1b604979..84af555e86 100644
--- a/ports/zeldaxd-mercurischess/README.md
+++ b/ports/zeldaxd-mercurischess/README.md
@@ -1,5 +1,5 @@
 ## Installation
-Download the game from https://solarus-games.org/games/the-legend-of-zelda-xd2-mercuris-chess/ and put in the zeldaxd-mercurischess/game folder.
+Download the game from https://solarus-games.org/games/the-legend-of-zelda-xd2-mercuris-chess/ and put in the `ports/zeldaxd-mercurischess` folder.
 
 ## Default Gameplay Controls
 | Button | Action |
diff --git a/ports/zeldaxd-mercurischess/The Legend of Zelda XD - Mercuris Chess.sh b/ports/zeldaxd-mercurischess/The Legend of Zelda XD - Mercuris Chess.sh
index 10c24a11d9..a4e1881b12 100644
--- a/ports/zeldaxd-mercurischess/The Legend of Zelda XD - Mercuris Chess.sh	
+++ b/ports/zeldaxd-mercurischess/The Legend of Zelda XD - Mercuris Chess.sh	
@@ -13,22 +13,43 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/zeldaxd-mercurischess"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "zxdmc.gptk" & 
+$GPTOKEYB "$runtime" -c "zxdmc.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
\ No newline at end of file
diff --git a/ports/zeldaxd-mercurischess/port.json b/ports/zeldaxd-mercurischess/port.json
index 3f00e4a3d1..8f7a6b1546 100644
--- a/ports/zeldaxd-mercurischess/port.json
+++ b/ports/zeldaxd-mercurischess/port.json
@@ -12,15 +12,15 @@
       "Jeod"
     ],
     "desc": "The sequel to Mystery of Solarus XD. While Link and Zelda were away, a rich businessman bought Hyrule! There begins your next adventure, in a world where everything has a price and where truth and lies become undistinguishable.",
-    "inst": "Download the game from https://solarus-games.org/games/the-legend-of-zelda-xd2-mercuris-chess/ and put in the zeldaxd-mercurischess/game folder.",
+    "inst": "Download the game from https://solarus-games.org/games/the-legend-of-zelda-xd2-mercuris-chess/ and put in the ports/zeldaxd-mercurischess folder.",
     "genres": [
       "action",
 	  "adventure"
     ],
-    "image": "zeldaxd-mercurischess.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }
\ No newline at end of file
diff --git a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/game/add .solarus file here b/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/game/add .solarus file here
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/lib/liblua5.1.so.0 b/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/lib/liblua5.1.so.0
deleted file mode 100644
index f99d953975..0000000000
Binary files a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/lib/liblua5.1.so.0 and /dev/null differ
diff --git a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/lib/libsolarus.so.1 b/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/lib/libsolarus.so.1
deleted file mode 100644
index b75b9c47eb..0000000000
Binary files a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/lib/libsolarus.so.1 and /dev/null differ
diff --git a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/lib/libmodplug.so.1 b/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/libs/libmodplug.so.1
similarity index 100%
rename from ports/zeldaxd-mercurischess/zeldaxd-mercurischess/lib/libmodplug.so.1
rename to ports/zeldaxd-mercurischess/zeldaxd-mercurischess/libs/libmodplug.so.1
diff --git a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/lib/libphysfs.so.1 b/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/libs/libphysfs.so.1
similarity index 100%
rename from ports/zeldaxd-mercurischess/zeldaxd-mercurischess/lib/libphysfs.so.1
rename to ports/zeldaxd-mercurischess/zeldaxd-mercurischess/libs/libphysfs.so.1
diff --git a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/savedata/zelda-xd2-mercuris-chess/settings.dat b/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/savedata/zelda-xd2-mercuris-chess/settings.dat
deleted file mode 100644
index ce2d724006..0000000000
--- a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/savedata/zelda-xd2-mercuris-chess/settings.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-video_mode = "normal"
-fullscreen = false
-sound_volume = 100
-music_volume = 100
-joypad_enabled = false
diff --git a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/solarus-run b/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/solarus-run
deleted file mode 100644
index 7e18402356..0000000000
Binary files a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/solarus-run and /dev/null differ
diff --git a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/zxdmc.gptk b/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/zxdmc.gptk
index 60fc59db70..d4d79e61a6 100644
--- a/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/zxdmc.gptk
+++ b/ports/zeldaxd-mercurischess/zeldaxd-mercurischess/zxdmc.gptk
@@ -1,9 +1,9 @@
 back = esc
-start = enter
-up = \"
-down = \"
-left = \"
-right = \"
+start = d
+up = up
+down = down
+left = left
+right = right
 
 a = space
 b = c
diff --git a/ports/zeldoschallenge/README.md b/ports/zeldoschallenge/README.md
index 3eb56b34f6..ada545a987 100644
--- a/ports/zeldoschallenge/README.md
+++ b/ports/zeldoschallenge/README.md
@@ -1,5 +1,5 @@
 ## Installation
-Download the game from https://solarus-games.org/games/defi-de-zeldo-ch-1/ and put in the zeldoschallenge/game folder.
+Download the game from https://solarus-games.org/games/defi-de-zeldo-ch-1/ and put in the `ports/zeldoschallenge` folder.
 
 ## Default Gameplay Controls
 | Button | Action |
@@ -13,6 +13,7 @@ Download the game from https://solarus-games.org/games/defi-de-zeldo-ch-1/ and p
 
 ## Thanks
 Cebion  
+Zeldo  
 Testers and Devs from the PortMaster Discord  
 
 
diff --git a/ports/zeldoschallenge/The Legend of Zelda - Zeldo's Challenge.sh b/ports/zeldoschallenge/The Legend of Zelda - Zeldo's Challenge.sh
index 5368c653ff..f19d34f041 100644
--- a/ports/zeldoschallenge/The Legend of Zelda - Zeldo's Challenge.sh	
+++ b/ports/zeldoschallenge/The Legend of Zelda - Zeldo's Challenge.sh	
@@ -13,22 +13,43 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/zeldoschallenge"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "zeldo1.gptk" & 
+$GPTOKEYB "$runtime" -c "zeldo1.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
\ No newline at end of file
diff --git a/ports/zeldoschallenge/port.json b/ports/zeldoschallenge/port.json
index 4f17ca1439..f42c8d3055 100644
--- a/ports/zeldoschallenge/port.json
+++ b/ports/zeldoschallenge/port.json
@@ -12,15 +12,15 @@
       "Jeod"
     ],
     "desc": "This game is then the first entry in ZeldoRetro’s series Le Défi de Zeldo (Zeldo’s Challenge). This first chapter is named La Revanche du Bingo (Bingo’s Revenge), and is much less ambitious than its sequel. It contains only one dungeon, and no overworld to explore, which makes the game rather short. You may beat it under an hour.",
-    "inst": "Download the game from https://solarus-games.org/games/defi-de-zeldo-ch-1/ and put in the zeldoschallenge/game folder.",
+    "inst": "Download the game from https://solarus-games.org/games/defi-de-zeldo-ch-1/ and put in the ports/zeldoschallenge folder.",
     "genres": [
       "action",
 	  "adventure"
     ],
-    "image": "zeldoschallenge.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }
\ No newline at end of file
diff --git a/ports/zeldoschallenge/zeldoschallenge/game/add .solarus file here b/ports/zeldoschallenge/zeldoschallenge/game/add .solarus file here
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ports/zeldoschallenge/zeldoschallenge/lib/liblua5.1.so.0 b/ports/zeldoschallenge/zeldoschallenge/lib/liblua5.1.so.0
deleted file mode 100644
index f99d953975..0000000000
Binary files a/ports/zeldoschallenge/zeldoschallenge/lib/liblua5.1.so.0 and /dev/null differ
diff --git a/ports/zeldoschallenge/zeldoschallenge/lib/libsolarus.so.1 b/ports/zeldoschallenge/zeldoschallenge/lib/libsolarus.so.1
deleted file mode 100644
index b75b9c47eb..0000000000
Binary files a/ports/zeldoschallenge/zeldoschallenge/lib/libsolarus.so.1 and /dev/null differ
diff --git a/ports/zeldoschallenge/zeldoschallenge/lib/libmodplug.so.1 b/ports/zeldoschallenge/zeldoschallenge/libs/libmodplug.so.1
similarity index 100%
rename from ports/zeldoschallenge/zeldoschallenge/lib/libmodplug.so.1
rename to ports/zeldoschallenge/zeldoschallenge/libs/libmodplug.so.1
diff --git a/ports/zeldoschallenge/zeldoschallenge/lib/libphysfs.so.1 b/ports/zeldoschallenge/zeldoschallenge/libs/libphysfs.so.1
similarity index 100%
rename from ports/zeldoschallenge/zeldoschallenge/lib/libphysfs.so.1
rename to ports/zeldoschallenge/zeldoschallenge/libs/libphysfs.so.1
diff --git a/ports/zeldoschallenge/zeldoschallenge/savedata/defi_zeldo_chap_1/settings.dat b/ports/zeldoschallenge/zeldoschallenge/savedata/defi_zeldo_chap_1/settings.dat
deleted file mode 100644
index ce2d724006..0000000000
--- a/ports/zeldoschallenge/zeldoschallenge/savedata/defi_zeldo_chap_1/settings.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-video_mode = "normal"
-fullscreen = false
-sound_volume = 100
-music_volume = 100
-joypad_enabled = false
diff --git a/ports/zeldoschallenge/zeldoschallenge/solarus-run b/ports/zeldoschallenge/zeldoschallenge/solarus-run
deleted file mode 100644
index 7e18402356..0000000000
Binary files a/ports/zeldoschallenge/zeldoschallenge/solarus-run and /dev/null differ
diff --git a/ports/zeldoschallenge2/README.md b/ports/zeldoschallenge2/README.md
index 5ebffe175d..a733499915 100644
--- a/ports/zeldoschallenge2/README.md
+++ b/ports/zeldoschallenge2/README.md
@@ -1,5 +1,5 @@
 ## Installation
-Download the game from https://solarus-games.org/games/defi-de-zeldo-ch-2/ and put in the zeldoschallenge2/game folder.
+Download the game from https://solarus-games.org/games/defi-de-zeldo-ch-2/ and put in the `ports/zeldoschallenge2` folder.
 
 ## Default Gameplay Controls
 | Button | Action |
@@ -13,6 +13,7 @@ Download the game from https://solarus-games.org/games/defi-de-zeldo-ch-2/ and p
 
 ## Thanks
 Cebion  
+Zeldo  
 Testers and Devs from the PortMaster Discord  
 
 
diff --git a/ports/zeldoschallenge2/The Legend of Zelda - Zeldo's Challenge 2.sh b/ports/zeldoschallenge2/The Legend of Zelda - Zeldo's Challenge 2.sh
index 75cdd34e39..189c063dbd 100644
--- a/ports/zeldoschallenge2/The Legend of Zelda - Zeldo's Challenge 2.sh	
+++ b/ports/zeldoschallenge2/The Legend of Zelda - Zeldo's Challenge 2.sh	
@@ -13,22 +13,43 @@ get_controls
 
 # Set variables
 GAMEDIR="/$directory/ports/zeldoschallenge2"
+runtime="solarus-1.6.5"
+solarus_dir="$HOME/portmaster-solarus"
+solarus_file="$controlfolder/libs/${runtime}.squashfs"
 
 # Exports
-export LD_LIBRARY_PATH="$GAMEDIR/lib:/usr/lib"
+export LD_LIBRARY_PATH="$GAMEDIR/libs:$solarus_dir"
 
 cd $GAMEDIR
 
+# Check for runtime
+if [ ! -f "$controlfolder/libs/${runtime}.squashfs" ]; then
+  # Check for runtime if not downloaded via PM
+  if [ ! -f "$controlfolder/harbourmaster" ]; then
+    echo "This port requires the latest PortMaster to run, please go to https://portmaster.games/ for more info." > /dev/tty0
+    sleep 5
+    exit 1
+  fi
+  $ESUDO $controlfolder/harbourmaster --quiet --no-check runtime_check "${runtime}.squashfs"
+fi
+
+# Setup Solarus
+$ESUDO mkdir -p "$solarus_dir"
+$ESUDO umount "$solarus_file" || true
+$ESUDO mount "$solarus_file" "$solarus_dir"
+PATH="$solarus_dir:$PATH"
+
 # Setup controls
 $ESUDO chmod 666 /dev/tty0
 $ESUDO chmod 666 /dev/tty1
 $ESUDO chmod 666 /dev/uinput
-$GPTOKEYB "solarus-run" -c "zeldo2.gptk" & 
+$GPTOKEYB "$runtime" -c "zeldo2.gptk" & 
 
 # Run the game
 echo "Loading, please wait... (might take a while!)" > /dev/tty0
-./solarus-run $GAMEDIR/game/*.solarus 2>&1 | tee -a ./"log.txt"
+"$runtime" $GAMEDIR/*.solarus 2>&1 | tee -a ./"log.txt"
 $ESUDO kill -9 $(pidof gptokeyb)
+$ESUDO umount "$solarus_file" || true
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
 printf "\033c" > /dev/tty0
\ No newline at end of file
diff --git a/ports/zeldoschallenge2/port.json b/ports/zeldoschallenge2/port.json
index 21937470d2..2186ffc6a9 100644
--- a/ports/zeldoschallenge2/port.json
+++ b/ports/zeldoschallenge2/port.json
@@ -12,15 +12,15 @@
       "Jeod"
     ],
     "desc": "After having touched the Trophy of Victory won at the end of the first chapter’s dungeon, Link is teleported in High-rule, a parallel world where multiple video games universes are mixed up. Link must go to the Tower of Memories where Zeldo is waiting for him to get his revenge!",
-    "inst": "Download the game from https://solarus-games.org/games/defi-de-zeldo-ch-2/ and put in the zeldoschallenge2/game folder.",
+    "inst": "Download the game from https://solarus-games.org/games/defi-de-zeldo-ch-2/ and put in the ports/zeldoschallenge2 folder.",
     "genres": [
       "action",
 	  "adventure"
     ],
-    "image": "zeldoschallenge2.screenshot.png",
+    "image": "screenshot.png",
     "rtr": false,
     "exp": false,
-    "runtime": null,
+    "runtime": "solarus-1.6.5",
     "reqs": []
   }
 }
\ No newline at end of file
diff --git a/ports/zeldoschallenge2/zeldoschallenge2/game/add .solarus file here b/ports/zeldoschallenge2/zeldoschallenge2/game/add .solarus file here
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/ports/zeldoschallenge2/zeldoschallenge2/lib/liblua5.1.so.0 b/ports/zeldoschallenge2/zeldoschallenge2/lib/liblua5.1.so.0
deleted file mode 100644
index f99d953975..0000000000
Binary files a/ports/zeldoschallenge2/zeldoschallenge2/lib/liblua5.1.so.0 and /dev/null differ
diff --git a/ports/zeldoschallenge2/zeldoschallenge2/lib/libsolarus.so.1 b/ports/zeldoschallenge2/zeldoschallenge2/lib/libsolarus.so.1
deleted file mode 100644
index b75b9c47eb..0000000000
Binary files a/ports/zeldoschallenge2/zeldoschallenge2/lib/libsolarus.so.1 and /dev/null differ
diff --git a/ports/zeldoschallenge2/zeldoschallenge2/lib/libmodplug.so.1 b/ports/zeldoschallenge2/zeldoschallenge2/libs/libmodplug.so.1
similarity index 100%
rename from ports/zeldoschallenge2/zeldoschallenge2/lib/libmodplug.so.1
rename to ports/zeldoschallenge2/zeldoschallenge2/libs/libmodplug.so.1
diff --git a/ports/zeldoschallenge2/zeldoschallenge2/lib/libphysfs.so.1 b/ports/zeldoschallenge2/zeldoschallenge2/libs/libphysfs.so.1
similarity index 100%
rename from ports/zeldoschallenge2/zeldoschallenge2/lib/libphysfs.so.1
rename to ports/zeldoschallenge2/zeldoschallenge2/libs/libphysfs.so.1
diff --git a/ports/zeldoschallenge2/zeldoschallenge2/savedata/defi_zeldo_chap_2/settings.dat b/ports/zeldoschallenge2/zeldoschallenge2/savedata/defi_zeldo_chap_2/settings.dat
deleted file mode 100644
index ce2d724006..0000000000
--- a/ports/zeldoschallenge2/zeldoschallenge2/savedata/defi_zeldo_chap_2/settings.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-video_mode = "normal"
-fullscreen = false
-sound_volume = 100
-music_volume = 100
-joypad_enabled = false
diff --git a/ports/zeldoschallenge2/zeldoschallenge2/solarus-run b/ports/zeldoschallenge2/zeldoschallenge2/solarus-run
deleted file mode 100644
index 7e18402356..0000000000
Binary files a/ports/zeldoschallenge2/zeldoschallenge2/solarus-run and /dev/null differ