diff --git a/emu-configs/defaults/retrodeck/helper_files/Install-firmware-through-Ryujinx.txt b/emu-configs/defaults/retrodeck/helper_files/Install-firmware-through-Ryujinx.txt
new file mode 100644
index 00000000..8f7110cb
--- /dev/null
+++ b/emu-configs/defaults/retrodeck/helper_files/Install-firmware-through-Ryujinx.txt
@@ -0,0 +1,6 @@
+Do not drop the firmware files here, install them via Ryujinx, check the wiki for more information.
+
+Related wiki article can be found here:
+https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/ryujinx/ryujinx-guide/
+
+The RetroDECK Team
\ No newline at end of file
diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Duckstation-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Duckstation-textures.txt
index 4deee10f..75153575 100644
--- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Duckstation-textures.txt
+++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Duckstation-textures.txt
@@ -23,6 +23,6 @@ Texture folder directly
 - Move textures into the right ~/retrodeck/texture_packs/duckstation/<TITLEID> folder.
 
 Related wiki article can be found here:
-https://github.com/XargonWan/RetroDECK/wiki/Duckstation%3A-Texture-Packs
+https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/duckstation/duckstation-texture-pack/
 
 The RetroDECK Team
\ No newline at end of file
diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mesen-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mesen-textures.txt
index 33e9d9c8..961ff4a7 100644
--- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mesen-textures.txt
+++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mesen-textures.txt
@@ -27,6 +27,6 @@ You want apply a texture pack to a game called ScaryCastle USA.nes and you have
 NOTE: On the Steam Deck go into GameMode first, then launch RetroDECK.
 
 Related wiki article can be found here:
-https://github.com/XargonWan/RetroDECK/wiki/RetroArch-Mesen%3A-Texture-Packs
+https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/retroarch/retroarch-mesen-texture-pack/
 
 The RetroDECK Team
\ No newline at end of file
diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mupen64Plus-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mupen64Plus-textures.txt
index 6cfe0670..825751aa 100644
--- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mupen64Plus-textures.txt
+++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-Mupen64Plus-textures.txt
@@ -25,6 +25,6 @@ For compressed textures stored in .hts files, place them in the 'texture_packs/R
 For uncompressed textures stored in loose folders or files, place them in the 'texture_packs/RetroArch-Mupen64Plus/hires_texture/' folder.
 
 Related wiki article can be found here:
-https://github.com/XargonWan/RetroDECK/wiki/RetroArch-Mupen64Plus-Next%3A-Texture-Packs
+https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/retroarch/retroarch-mupen64plus-texture-pack/
 
 The RetroDECK Team
\ No newline at end of file
diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-PCSX2-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-PCSX2-textures.txt
index 807513b7..ed75e899 100644
--- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-PCSX2-textures.txt
+++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-PCSX2-textures.txt
@@ -21,6 +21,6 @@ For direct texture folder:
 3. Move textures into the correct '~/retrodeck/texture_packs/PCSX2/<TITLEID>' folder.
 
 Related wiki article can be found here:
-https://github.com/XargonWan/RetroDECK/wiki/PCSX2%3A-Texture-Packs
+https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/pcsx2/pcsx2-texture-pack/
 
 The RetroDECK Team
\ No newline at end of file
diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-PPSSPP-textures.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-PPSSPP-textures.txt
index 6fabb0e4..44a6da45 100644
--- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-PPSSPP-textures.txt
+++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-PPSSPP-textures.txt
@@ -21,6 +21,6 @@ For adding textures:
 3. Paste the textures into the correct '~/retrodeck/texture_packs/ppsspp/<TITLEID>' folder.
 
 Related wiki article can be found here:
-https://github.com/XargonWan/RetroDECK/wiki/PPSSPP%3A-Texture-Packs
+https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/ppsspp/ppsspp-texture-pack/
 
 The RetroDECK Team
\ No newline at end of file
diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt
index 33a50c8c..a9b96bc5 100644
--- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt
+++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-dolphin-mods.txt
@@ -14,6 +14,6 @@ Notes:
 - GAME_ID is different for every game.
 
 Related wiki article can be found here:
-https://github.com/XargonWan/RetroDECK/wiki/Dolphin-and-Primehack%3A-Mods
+https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/dolphin-primehack/dolphin-primehack-mod/
 
 The RetroDECK Team
\ No newline at end of file
diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt
index 1bcbbc05..8d3650e9 100644
--- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt
+++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-primehack-mods.txt
@@ -14,6 +14,6 @@ Notes:
 - GAME_ID is different for every game.
 
 Related wiki article can be found here:
-https://github.com/XargonWan/RetroDECK/wiki/Dolphin-and-Primehack%3A-Mods
+https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/dolphin-primehack/dolphin-primehack-mod/
 
 The RetroDECK Team
\ No newline at end of file
diff --git a/emu-configs/defaults/retrodeck/helper_files/how-to-install-psvita-games.txt b/emu-configs/defaults/retrodeck/helper_files/how-to-install-psvita-games.txt
index febbde78..e51a66b5 100644
--- a/emu-configs/defaults/retrodeck/helper_files/how-to-install-psvita-games.txt
+++ b/emu-configs/defaults/retrodeck/helper_files/how-to-install-psvita-games.txt
@@ -17,6 +17,6 @@ For example the game `WipEout 2048 (EU)` has an ID that is `PCSF00007`.
 So simply add `PCSF00007` to the `WipEout 2048 (EU).psvita` file and the setup for this game is complete.
 
 Related wiki article can be found here:
---
+https://retrodeck.readthedocs.io/en/latest/wiki_emulator_guides/vita3k/vita3k-guide/
 
 The RetroDECK Team
\ No newline at end of file
diff --git a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg
index ffb832cd..10630974 100644
--- a/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg
+++ b/emu-configs/defaults/retrodeck/reference_lists/helper_files_list.cfg
@@ -17,3 +17,4 @@ how-to-install-Duckstation-textures.txt^$texture_packs_folder/Duckstation
 
 # emulators
 how-to-install-psvita-games.txt^$roms_folder/psvita
+Install-firmware-through-Ryujinx.txt^$bios_folder/switch/firmware
diff --git a/functions/global.sh b/functions/global.sh
index f37658e1..b4cd5b8c 100644
--- a/functions/global.sh
+++ b/functions/global.sh
@@ -168,7 +168,7 @@ if [[ ! -f "$rd_conf" ]]; then
   set_setting_value $rd_conf "version" "$version" retrodeck # Set current version for new installs
   set_setting_value $rd_conf "sdcard" "$default_sd" retrodeck "paths" # Set SD card location if default path has changed
 
-  if grep -qF "cooker" <<< $hard_version; then # If newly-installed version is a "cooker" build
+  if grep -qF "cooker" <<< "$hard_version" || grep -qF "PR-" <<< "$hard_version"; then # If newly-installed version is a "cooker" or PR build
     set_setting_value $rd_conf "update_repo" "RetroDECK-cooker" retrodeck "options"
     set_setting_value $rd_conf "update_check" "true" retrodeck "options"
     set_setting_value $rd_conf "developer_options" "true" retrodeck "options"
diff --git a/functions/post_update.sh b/functions/post_update.sh
index fb7120e2..29abcee4 100644
--- a/functions/post_update.sh
+++ b/functions/post_update.sh
@@ -344,7 +344,7 @@ post_update() {
   zenity --icon-name=net.retrodeck.retrodeck --progress --no-cancel --pulsate --auto-close \
   --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
   --title "RetroDECK Finishing Upgrade" \
-  --text="RetroDECK is finishing the upgrade process, please wait."
+  --text="RetroDECK is finishing the upgrade process, please wait.\n\n If it feels like this is taking too much time, please ensure there aren't any windows that unexpectedly slipped into the background and need attention."
 
   version=$hard_version
   conf_write
diff --git a/incconfigs/todo.readme b/incconfigs/todo.readme
deleted file mode 100644
index f4e9974a..00000000
--- a/incconfigs/todo.readme
+++ /dev/null
@@ -1,34 +0,0 @@
-Vita3K
-
-Fix the bindings and make sure everything works
-
-MAME
-
-Double check all the inputs and hotkeys for Player 1 to 4
-
-GZDoom
-
-Fix the config.
-Feel if the bindings are right when everything is done and all works as excpected.
-
-Primehack
-
-See what bindings works best
-
-Dolphin
-
-Look into Rotational controls while holding two buttons + right joystick.
-
-RetroArch
-
-User complained about Touchscreen
-Make sure the config is SDL
-
-ALL
-
-Test all inputs after everything is done
-
-
-Question:
-
-Does the X/Y A/B switcher needs to be updated?
diff --git a/incconfigs/whatis.readme b/incconfigs/whatis.readme
deleted file mode 100644
index e69de29b..00000000
diff --git a/net.retrodeck.retrodeck.appdata.xml b/net.retrodeck.retrodeck.appdata.xml
index 349c167b..a8383326 100644
--- a/net.retrodeck.retrodeck.appdata.xml
+++ b/net.retrodeck.retrodeck.appdata.xml
@@ -87,7 +87,7 @@
             <ul>
                <li>All the emulators and engines are updated to their latest version</li>
                <li>ES-DE: updated to 3.0.1</li>
-               <li>RPCS3 is now running via shortcut (.desktop file) by default - WARN THE USERS TO MIGRATE and how to change it back</li>
+               <li>RPCS3 is now running via shortcut (.desktop file) by default</li>
                <li>CITRA-SA: removed, it will available trough Ponzu. The libretro core is now the default emulator</li>
                <li>YUZU: removed, Ryujinx is now the default emulator, it will available trough Ponzu</li>
                <li>PONZU: added, check the wiki if interested in this preservational function</li>
diff --git a/tools/configurator.sh b/tools/configurator.sh
index 67a99440..92ab7175 100644
--- a/tools/configurator.sh
+++ b/tools/configurator.sh
@@ -612,6 +612,8 @@ configurator_retrodeck_tools_dialog() {
         --icon-name=net.retrodeck.retrodeck \
         --window-icon="/app/share/icons/hicolor/scalable/apps/net.retrodeck.retrodeck.svg" \
         --title="Downloading PS3 Firmware" \
+        --width=400 --height=200 \
+        --text="If it feels like this is taking too much time, please ensure there aren't any windows that unexpectedly slipped into the background and need attention.\n\n" \
         --no-cancel \
         --auto-close
     else