diff --git a/audiogame-manager.sh b/audiogame-manager.sh
index ef11b06..bd9970c 100755
--- a/audiogame-manager.sh
+++ b/audiogame-manager.sh
@@ -286,6 +286,19 @@ get_bottle() {
     # Handles games that use the same wine bottle
     case "${game}" in 
         "bg-"*) export WINEPREFIX="${HOME}/.local/wine/bg";;
+        # Oriol Gomez games group
+        "beatstar-pro"*) ;&
+        "bombercats"*) ;&
+        "copter-mission"*) ;&
+        "danger-on-the-wheel"*) ;&
+        "death-on-the-road"*) ;&
+        "fuck-that-bird"*) ;&
+        "hammer-of-glory"*) ;&
+        "insect-therapy"*) ;&
+        "rhythm-rage"*) ;&
+        "run-for-your-life"*) ;&
+        "thief"*) ;&
+        "villains-from-beyond"*) export WINEPREFIX="${HOME}/.local/wine/oriol-gomez";;
         *) export WINEPREFIX="${HOME}/.local/wine/${game%|*}";;
     esac
 }
@@ -568,13 +581,15 @@ game_launcher() {
             open_url "https://patreon.com/stormux"
             exit 0
         fi
+        get_bottle "$game"
         local winePath="${game#*|}"
         winePath="${winePath%\\*.exe}"
         local wineExec="${game#*|}"
         wineExec="${wineExec%|*}"
         wineExec="${wineExec##*\\}"
         # kill any previous existing wineservers for this prefix in case they didn't shut down properly.
-        WINEPREFIX="${HOME}/.local/wine/${game%|*}" wineserver -k
+        wineserver -k
+        # launch the game
         # launch the game
         if command -v qjoypad &> /dev/null ; then
             mkdir -p ~/.qjoypad3
@@ -585,7 +600,6 @@ game_launcher() {
                 qjoypad -T "${game%|*}" 2> /dev/null &
             fi
         fi
-        get_bottle "$game"
         # for games that require custom scripts before launch or custom launch parameters
         if [[ "$game" =~ sequence-storm ]]; then
             [[ -x ~/.SequenceStormReader ]] && ~/.SequenceStormReader &
@@ -860,6 +874,7 @@ case "${game}" in
         add_launcher "c:\Program Files\Battle Zone\ss.exe"
     ;;
     "Beatstar Pro")
+        export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle speechsdk mf
         download "https://oriolgomez.com/games/beat_windows.zip"
@@ -946,6 +961,7 @@ case "${game}" in
         add_launcher "c:\Program Files\bloodshed.exe"
     ;;
     "Bombercats")
+        export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle
         download "http://oriolgomez.com/games/bombercats_en.zip"
@@ -1001,6 +1017,7 @@ case "${game}" in
         add_launcher "c:\Program Files\Draconis Entertainment\Christmas Whoop Ass\wa.exe"
     ;;
     "Copter Mission")
+        export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle
         download "http://oriolgomez.com/games/copter_en.zip"
@@ -1022,6 +1039,7 @@ case "${game}" in
         add_launcher "c:\Program Files\Crazytennis\crazytennis.exe"
     ;;
     "Danger on the Wheel")
+        export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle speechsdk
         download "http://oriolgomez.com/games/wheel_en.zip"
@@ -1030,6 +1048,7 @@ case "${game}" in
         add_launcher "c:\Program Files\danger on the wheel\game.exe"
     ;;
     "Death on the Road")
+        export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle
         download "http://oriolgomez.com/games/road_en.zip"
@@ -1099,6 +1118,7 @@ case "${game}" in
         add_launcher "c:\Program Files\Finger Panic 1.0\FingerPanic.exe"
     ;;
     "Fuck That Bird")
+        export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle
         download "http://oriolgomez.com/games/bird_en.zip"
@@ -1136,6 +1156,7 @@ case "${game}" in
         add_launcher "c:\Program Files\GMA Tank Commander\gtc.exe"
     ;;
     "Hammer of Glory")
+        export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle speechsdk
         download "http://oriolgomez.com/games/hammer_en.zip"
@@ -1186,6 +1207,7 @@ case "${game}" in
         add_launcher "c:\Program Files\Hunter\HunterRun.exe"
     ;;
     "Insect Therapy")
+        export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle
         download "http://oriolgomez.com/games/insect_en.zip"
@@ -1372,6 +1394,7 @@ EOF
         add_launcher "c:\Program Files\revenge of the undead\rotu.exe"
     ;;
     "Rhythm Rage")
+        export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle speechsdk
         download "http://oriolgomez.com/games/rr_en.zip" "https://stormgames.wolfe.casa/downloads/nvdaControllerClient32.dll"
@@ -1397,6 +1420,7 @@ EOF
         add_launcher "c:\Program Files\RS Games Client\rsg.exe"
     ;;
     "Run For Your Life")
+        export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle
         download "http://oriolgomez.com/games/rfyl_en.zip"
@@ -1536,6 +1560,7 @@ EOF
         add_launcher "c:\Program Files\Lworks\The Great Toy Robbery\tgtr.exe"
     ;;
     "Thief")
+        export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle
         download "http://oriolgomez.com/games/thief_en.zip"
@@ -1631,6 +1656,7 @@ EOF
         add_launcher "c:\Program Files\undead_assault\Undead Assault.exe"
     ;;
     "Villains From Beyond")
+        export bottle="oriol-gomez"
         export winVer="win7"
         install_wine_bottle speechsdk
         download "http://oriolgomez.com/games/villains_en.zip"