diff --git a/archive_later/dosbox-x/assets/rd_config/dosbox-x.conf b/archive_later/dosbox-x/assets/rd_config/dosbox-x.conf
index b5850ddb..c8961341 100644
--- a/archive_later/dosbox-x/assets/rd_config/dosbox-x.conf
+++ b/archive_later/dosbox-x/assets/rd_config/dosbox-x.conf
@@ -225,7 +225,7 @@ configuration tool theme  = Windows Default
 dpi aware                 = auto
 quit warning              = false
 working directory option  = default
-working directory default = $storage_path/dosbox-x
+working directory default = $storage_path/windows/dosbox-x
 show advanced options     = false
 resolve config path       = true
 hostkey                   = mapper
diff --git a/archive_later/dosbox-x/component_prepare.sh b/archive_later/dosbox-x/component_prepare.sh
index 8c546318..cf92a938 100755
--- a/archive_later/dosbox-x/component_prepare.sh
+++ b/archive_later/dosbox-x/component_prepare.sh
@@ -13,8 +13,8 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands
   cp -fT "$component_config/dosbox-x.conf" "$dosbox_x_config"
 
   # Default General Storage
-  create_dir "$storage_path/dosbox-x"
-  set_setting_value "$dosbox_x_config" "working directory default" "$storage_path/dosbox-x" "dosbox-x"
+  create_dir "$storage_path/windows/dosbox-x"
+  set_setting_value "$dosbox_x_config" "working directory default" "$storage_path/windows/dosbox-x" "dosbox-x"
 
   # Logs path
   create_dir "$logs_path/dosbox-x"
diff --git a/archive_later/uzdoom/component_prepare.sh b/archive_later/uzdoom/component_prepare.sh
index 05223471..e7e35881 100755
--- a/archive_later/uzdoom/component_prepare.sh
+++ b/archive_later/uzdoom/component_prepare.sh
@@ -16,9 +16,9 @@ if [[ "$action" == "reset" ]]; then # Run reset-only commands
   create_dir "$XDG_DATA_HOME/uzdoom/audio/fm_banks"
   create_dir "$XDG_DATA_HOME/uzdoom/audio/soundfonts"
   create_dir "$bios_path/uzdoom"
-  create_dir "$storage_path/uzdoom/audio/soundfonts"
-  create_dir "$storage_path/uzdoom/audio/fm_banks"
-  create_dir "$storage_path/uzdoom/audio/midi"
+  create_dir "$storage_path/doom/uzdoom/audio/soundfonts"
+  create_dir "$storage_path/doom/uzdoom/audio/fm_banks"
+  create_dir "$storage_path/doom/uzdoom/audio/midi"
 
   cp -fv "$component_config/uzdoom.ini" "$uzdoom_config"
 
diff --git a/archive_later/uzdoom/component_update.sh b/archive_later/uzdoom/component_update.sh
index 4d6377ea..ddb42abd 100644
--- a/archive_later/uzdoom/component_update.sh
+++ b/archive_later/uzdoom/component_update.sh
@@ -4,3 +4,13 @@
 # These actions happen conditionally based on the version being upgraded
 #########################################################################
 
+if [[ $(check_version_is_older_than "$version_being_updated" "0.10.1b") == "true" ]]; then
+    if [ -d "$storage_path/uzdoom"]; then
+        move "$storage_path/uzdoom" "$storage_path/doom/uzdoom"
+    fi
+    if [ -d "$storage_path/gzdoom"]; then
+        move "$storage_path/gzdoom" "$storage_path/doom/uzdoom"
+    fi
+    if [ -d "$storage_path/doom/gzdoom"]; then
+        move "$storage_path/doom/gzdoom" "$storage_path/doom/uzdoom"
+    fi
diff --git a/archive_later/xenia/recipe_todo.txt b/archive_later/xenia/recipe_todo.txt
index dff905ab..ef1f28f0 100644
--- a/archive_later/xenia/recipe_todo.txt
+++ b/archive_later/xenia/recipe_todo.txt
@@ -29,6 +29,6 @@ OLD PREPARE
 
   # Storage
 
-  create_dir "$storage_path/xenia/storage"
+  create_dir "$storage_path/x360/xenia/storage"
   dir_prep "$storage_path/xbox360/xenia/storage" "/app/retrodeck/components/xenia/storage"
-  create_dir "$storage_path/xenia/fonts"
+  create_dir "$storage_path/x360/xenia/fonts"
diff --git a/automation-tools/alchemist/desired_versions.sh b/automation-tools/alchemist/desired_versions.sh
index 1969a745..2d5235df 100644
--- a/automation-tools/alchemist/desired_versions.sh
+++ b/automation-tools/alchemist/desired_versions.sh
@@ -151,8 +151,8 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08"
 # Source: Flatpak
 # ------------------------------------------------------------------------------
 # MAIN (Stable)
-# Version: 0.2.0-nightly.2025.12.31
- export RUFFLE_DESIRED_VERSION="70edc0d9e8b564a764124bab3878654ede76eb148883019f7648eb32b26b19dd"
+# Version: 0.2.0-nightly.2026.1.8
+ export RUFFLE_DESIRED_VERSION="db881e38b0b37481ede11e56b307e0962760f1d26dedaff122e4f5c4221be1f3"
 
 # COOKER (Override)
 # export RUFFLE_DESIRED_VERSION="latest"
@@ -208,7 +208,7 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08"
 # Source: AppImage
 # ------------------------------------------------------------------------------
 # MAIN (Stable)
-  export PCSX2_DESIRED_VERSION="v2.6.1"
+  export PCSX2_DESIRED_VERSION="v2.6.2"
 
 # COOKER (Override)
 # export PCSX2_DESIRED_VERSION="newest"
@@ -340,7 +340,7 @@ export DESIRED_QT5_RUNTIME_VERSION="5.15-25.08"
 # Repo: https://github.com/RetroDECK/Vita3K-bin
 # ------------------------------------------------------------------------------
 # MAIN (Stable)
-  export VITA3K_DESIRED_VERSION="3883"
+  export VITA3K_DESIRED_VERSION="3893"
 
 # COOKER (Override)
 # export VITA3K_DESIRED_VERSION="latest"