diff --git a/.scripts/FreeDoom.sh b/.scripts/FreeDoom.sh
index fd05c26..6054635 100755
--- a/.scripts/FreeDoom.sh
+++ b/.scripts/FreeDoom.sh
@@ -6,7 +6,7 @@ export DIALOGOPTS='--no-lines --visit-items'
 
 
 # Toby games path
-gamePath=~/.local/games/doom
+export gamePath=~/.local/games/doom
 # Path where doom wads are stored
 export doomPath="$(find /usr/share -type d -name "doom" 2> /dev/null | head -1)"
 
@@ -17,19 +17,28 @@ export gzdoom="$(command -v gzdoom)"
 export tobyVersion="7-5"
 
 
+# Doom Addons
+mapfile -t doomAddons < <(find "$gamePath/Addons/DOOM/" -type f -name "TobyV${tobyVersion%%-*}_*.pk3"
+    find "$gamePath/Addons/MENU/" -type f -name "TobyV${tobyVersion%%-*}_*.pk3"
+)
+# Heretic Addons
+mapfile -t hereticAddons < <(find "$gamePath/Addons/HERETIC/" -type f -name "TobyHeretic*.pk3"
+    find "$gamePath/Addons/MENU/" -type f -name "TobyV${tobyVersion%%-*}_*.pk3"
+)
+
 doomGames=(
     # Toby demo map
-    "TobyAccMod_V${tobyVersion}.pk3 Toby-Demo-Level.wad ""$gamePath/Addons/TobyV${tobyVersion%%-*}_"* "Freedoom Toby Demo Map"
+    "TobyAccMod_V${tobyVersion}.pk3 Toby-Demo-Level.wad ${doomAddons[*]}" "Freedoom Toby Demo Map"
     # Unmodified Doom with accessibility.
-    "TobyAccMod_V${tobyVersion}.pk3 ""$gamePath/Addons/TobyV${tobyVersion%%-*}_"* "Freedoom"
+    "TobyAccMod_V${tobyVersion}.pk3 ${doomAddons[*]}" "Freedoom"
     # Toby accessibility mods
-    "TobyAccMod_V${tobyVersion}.pk3 TobyDoomLevels.wad ""$gamePath/Addons/TobyV${tobyVersion%%-*}_"* "Freedoom Toby Delux Map Pack"
+    "TobyAccMod_V${tobyVersion}.pk3 TobyDoomLevels.wad ${doomAddons[*]}" "Freedoom Toby Delux Map Pack"
     # OperationMDK
-    "TobyAccMod_V${tobyVersion}.pk3 OpMDK.wad ""$gamePath/Addons/TobyV${tobyVersion%%-*}_"* "Freedoom OperationMDK"
+    "TobyAccMod_V${tobyVersion}.pk3 OpMDK.wad ${doomAddons[*]}" "Freedoom OperationMDK"
     # Unmodified Heretic with accessibility
-    "TobyAccMod_V${tobyVersion}.pk3 ""$gamePath/Addons/HERETIC/TobyHeretic"* "Classic Heretic"
+    "TobyAccMod_V${tobyVersion}.pk3 ${hereticAddons[*]}" "Classic Heretic"
     # Heretic accessibility mods
-    "TobyAccMod_V${tobyVersion}.pk3 TobyHereticLevels.wad ""$gamePath/Addons/HERETIC/TobyHeretic"* "Toby Heretic"
+    "TobyAccMod_V${tobyVersion}.pk3 TobyHereticLevels.wad ${hereticAddons[*]}" "Toby Heretic"
     "custom_game" "Custom Game"
 )
 
diff --git a/.scripts/TobyCustom/Brutal_Death_Match.sh b/.scripts/TobyCustom/Brutal_Death_Match.sh
index 4b1f240..c991b83 100755
--- a/.scripts/TobyCustom/Brutal_Death_Match.sh
+++ b/.scripts/TobyCustom/Brutal_Death_Match.sh
@@ -7,6 +7,7 @@ gamePath=~/.local/games/doom
 # Set up the pk3 and wad files 
 gameOption=(
     "${gamePath}/TobyAccMod_V${tobyVersion}.pk3"
+    "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"*
     "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')"
     "$(find ~/.local/games/doom -name 'Project_Brutality-master.pk3')"
     "${gamePath}/TobyDeathArena_V1-0.wad"
diff --git a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh
index 38f0212..93825fe 100755
--- a/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh
+++ b/.scripts/TobyCustom/Project_Brutality_Operation_MDK.sh
@@ -7,6 +7,7 @@ gamePath=~/.local/games/doom
 # Set up the pk3 and wad files 
 gameOption=(
     "${gamePath}/TobyAccMod_V${tobyVersion}.pk3"
+    "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"*
     "${gamePath}/OpMDK.wad"
     "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')"
     "$(find ~/.local/games/doom -name 'Project_Brutality-master.pk3')"
diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh
index 1c4814b..6d4e6fb 100755
--- a/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh
+++ b/.scripts/TobyCustom/Project_Brutality_Toby_Deluxe.sh
@@ -8,7 +8,7 @@ gamePath=~/.local/games/doom
 # Set up the pk3 and wad files 
 gameOption=(
     "${gamePath}/TobyAccMod_V${tobyVersion}.pk3"
-    "${gamePath}/PB-Toby-Compatibility-Addon.pk3"
+    "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"*
     "${gamePath}/TobyDoomLevels.wad"
     "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')"
     "$(find ~/.local/games/doom -name 'Project_Brutality-master.pk3')"
diff --git a/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh b/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh
index d5ee610..e5d28a3 100755
--- a/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh
+++ b/.scripts/TobyCustom/Project_Brutality_Toby_Demo.sh
@@ -8,7 +8,7 @@ gamePath=~/.local/games/doom
 # Set up the pk3 and wad files 
 gameOption=(
     "${gamePath}/TobyAccMod_V${tobyVersion}.pk3"
-    "${gamePath}/PB-Toby-Compatibility-Addon.pk3"
+    "$gamePath/Addons/MENU/TobyV${tobyVersion%%-*}_"*
     "${gamePath}/Toby-Demo-Level.wad"
     "$(find /usr/share/games/ -name 'Project_Brutality-master.pk3')"
     "$(find ~/.local/games/doom -name 'Project_Brutality-master.pk3')"