diff --git a/pandora/PXML.xml b/pandora/PXML.xml
index 04c18c0042..4f4f56fb32 100644
--- a/pandora/PXML.xml
+++ b/pandora/PXML.xml
@@ -8,7 +8,7 @@
 
     <author name="lifning" website="http://libretro.org/"/>
 
-    <version major="0" minor="9" release="6" build="5" type="beta"/>
+    <version major="0" minor="9" release="7" build="1" type="beta"/>
 
     <titles>
       <title lang="en_US">RetroArch</title>
@@ -30,7 +30,7 @@
 
     <author name="Themaister" website="http://themaister.net/retroarch.html"/>
 
-    <version major="0" minor="9" release="6" build="5"/>
+    <version major="0" minor="9" release="7" build="1"/>
     <osversion major="1" minor="0" release="0" build="0"/>
 
     <titles>
diff --git a/pandora/scripts/env-vars.sh b/pandora/scripts/env-vars.sh
index 22a81d4fd2..01d2250d0b 100755
--- a/pandora/scripts/env-vars.sh
+++ b/pandora/scripts/env-vars.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 
-export PATH="/mnt/utmp/retroarch/bin:${PATH:-"/usr/bin:/bin:/usr/local/bin"}"
-export LD_LIBRARY_PATH="/mnt/utmp/retroarch/lib:${LD_LIBRARY_PATH:-"/usr/lib:/lib"}"
-export HOME="/mnt/utmp/retroarch" XDG_CONFIG_HOME="/mnt/utmp/retroarch"
+export HOME="$(readlink -f $(dirname $0)/..)"
+export XDG_CONFIG_HOME="${HOME}"
+export PATH="${HOME}/bin:${PATH:-"/usr/bin:/bin:/usr/local/bin"}"
+export LD_LIBRARY_PATH="${HOME}/lib:${LD_LIBRARY_PATH:-"/usr/lib:/lib"}"
 
 if [ -d /mnt/utmp/retroarch/share ] ; then
-	export XDG_DATA_DIRS=/mnt/utmp/retroarch/share:$XDG_DATA_DIRS:/usr/share
+	export XDG_DATA_DIRS=${HOME}/share:$XDG_DATA_DIRS:/usr/share
 fi
 
 # use notaz's optimized driver
diff --git a/pandora/scripts/retroarch-phoenix.sh b/pandora/scripts/retroarch-phoenix.sh
index c816f6eeca..cb88f6340a 100755
--- a/pandora/scripts/retroarch-phoenix.sh
+++ b/pandora/scripts/retroarch-phoenix.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-source "/mnt/utmp/retroarch/scripts/env-vars.sh"
+source "$(dirname $0)/env-vars.sh"
 
 # load the libstdc++ from gcc-4.7 because phoenix doesn't build in anything less
-# preload my modified SDL that knows what "pixelperfect" is
-exec env LD_PRELOAD=/mnt/utmp/retroarch/lib/libstdc++.so.6:/mnt/utmp/retroarch/lib/libSDL-1.2.so.0.11.3 retroarch-phoenix "${@}"
+# preload latest notaz SDL that knows what "pixelperfect" is
+exec env LD_PRELOAD=${HOME}/lib/libstdc++.so.6:$HOME/lib/libSDL-1.2.so.0.11.3 retroarch-phoenix "${@}"
 
diff --git a/pandora/scripts/retroarch.sh b/pandora/scripts/retroarch.sh
index 4c2617b002..1f0f9d9413 100755
--- a/pandora/scripts/retroarch.sh
+++ b/pandora/scripts/retroarch.sh
@@ -1,19 +1,19 @@
 #!/bin/sh
 
-source "/mnt/utmp/retroarch/scripts/env-vars.sh"
+source "$(dirname $0)/env-vars.sh"
 
 # choose a libretro core.
-cd /mnt/utmp/retroarch/lib
+cd ${HOME}/lib
 BACKEND=$(ls -1 libretro*.so | zenity --list --column=Backend)
-cd $HOME
+cd ${HOME}
 
 # if user didn't select a libretro, bail out.
-[ -z "$BACKEND" ] && exit 0
+[ -z "${BACKEND}" ] && exit 0
 
 # narrow down the available file formats for the file chooser.
 FILTER='All files (*)|*'
-case "$BACKEND" in
-	libretro-fceu*.so)
+case "${BACKEND}" in
+	libretro-fceu*.so | libretro-bnes.so)
 		FILTER='NES (*.nes)|*.nes'
 		;;
 	libretro-pocketsnes.so | libretro-snes9x*.so)
@@ -22,14 +22,14 @@ case "$BACKEND" in
 	libretro-gambatte.so)
 		FILTER='GBC (*.gb; *.gbc)|*.gb *.gbc'
 		;;
-	libretro-meteor.so | libretro-vba.so)
+	libretro-meteor.so | libretro-vba.so | libretro-gpsp.so)
 		FILTER='GBA (*.gba)|*.gba'
 		;;
 	libretro-imame4all.so | libretro-fba.so)
 		FILTER='Arcade (*.zip)|*.zip'
 		;;
 	libretro-genplus.so)
-		FILTER='Genesis/MegaDrive (*.md; *.gen)|*.md *.gen'
+		FILTER='Genesis/MegaDrive/SegaCD (*.md; *.gen; *.bin; *.iso)|*.md *.gen *.bin *.iso'
 		;;
 	libretro-pcsx-rearmed.so)
 		FILTER='Disc image (*.iso; *.bin; *.img)|*.iso *.bin *.img'
@@ -48,10 +48,10 @@ fi
 ROM=$(zenity --file-selection --file-filter="${FILTER}" "${LASTROM}")
 
 # if user didn't select a ROM, bail out.
-[ -z "$ROM" ] && exit 0
+[ -z "${ROM}" ] && exit 0
 
-echo "$ROM" > "${BACKEND}-lastrom.txt"
+echo "${ROM}" > "${BACKEND}-lastrom.txt"
 
-# preload my modified SDL that knows what "pixelperfect" is
-exec env LD_PRELOAD=/mnt/utmp/retroarch/lib/libSDL-1.2.so.0.11.3 retroarch "${ROM}" -L "/mnt/utmp/retroarch/lib/${BACKEND}" "${@}"
+# latest notaz SDL that knows what "pixelperfect" is
+exec env LD_PRELOAD=${HOME}/lib/libSDL-1.2.so.0.11.3 retroarch "${ROM}" -L "${HOME}/lib/${BACKEND}" "${@}"