diff --git a/pandora/PXML.xml b/pandora/PXML.xml
index a75c462979..04c18c0042 100644
--- a/pandora/PXML.xml
+++ b/pandora/PXML.xml
@@ -2,14 +2,47 @@
 <PXML xmlns="http://openpandora.org/namespaces/PXML" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="PXML_schema.xsd">
 <!-- please see http://pandorawiki.org/PXML_specification for more information before editing, and remember the order does matter -->
 
-  <application id="retroarch-retroarch-3237" appdata="retroarch">
-    <exec command="scripts/retroarch.sh"/>
-    <title lang="en_US">RetroArch</title>
+
+
+  <package id="retroarch.lifning.001">
 
     <author name="lifning" website="http://libretro.org/"/>
-    <version major="0" minor="9" release="6" build="4"/>     <!--This programs version-->
-    <osversion major="1" minor="0" release="0" build="0"/>   <!--The minimum OS version required-->
 
+    <version major="0" minor="9" release="6" build="5" type="beta"/>
+
+    <titles>
+      <title lang="en_US">RetroArch</title>
+    </titles>
+
+    <descriptions>
+      <description lang="en_US">Frontend to libretro</description>
+    </descriptions>
+
+    <icon src="icon.png"/>
+
+  </package>
+
+
+
+  <application id="retroarch.lifning.001" appdata="retroarch">
+
+    <exec command="scripts/retroarch.sh"/>
+
+    <author name="Themaister" website="http://themaister.net/retroarch.html"/>
+
+    <version major="0" minor="9" release="6" build="5"/>
+    <osversion major="1" minor="0" release="0" build="0"/>
+
+    <titles>
+      <title lang="en_US">RetroArch</title>
+    </titles>
+    <!-- pre HF6 compatibility: -->
+    <title lang="en_US">RetroArch</title>
+
+    <descriptions>
+      <description lang="en_US">Frontend to libretro</description>
+    </descriptions>
+    <!-- pre HF6 compatibility: -->
     <description lang="en_US">Frontend to libretro</description>
 
     <icon src="icon.png"/>
@@ -20,6 +53,43 @@
 
     <info name="RetroArch documentation" type="text/html" src="/mnt/utmp/retroarch/readme.html"/>
 
+    <categories>
+      <!-- http://standards.freedesktop.org/menu-spec/latest/apa.html -->
+      <category name="Game">
+        <subcategory name="Emulator"/>
+      </category>
+    </categories>
+  </application>
+
+
+
+  <application id="retroarch.lifning.001" appdata="retroarch">
+
+    <exec command="scripts/retroarch-phoenix.sh"/>
+  
+    <author name="Themaister" website="http://themaister.net/retroarch.html"/>
+
+    <version major="0" minor="9" release="6" build="5"/>
+    <osversion major="1" minor="0" release="0" build="0"/>
+
+    <titles>
+      <title lang="en_US">RetroArch-Phoenix</title>
+    </titles>
+    <!-- pre HF6 compatibility: -->
+    <title lang="en_US">RetroArch-Phoenix</title>
+
+    <descriptions>
+      <description lang="en_US">Frontend to frontend to libretro</description>
+    </descriptions>
+    <!-- pre HF6 compatibility: -->
+    <description lang="en_US">Frontend to frontend to libretro</description>
+
+    <icon src="icon.png"/>
+
+    <previewpics>
+      <pic src="previews/retroarch-phoenix.png"/>
+    </previewpics>
+
     <categories>
       <!-- http://standards.freedesktop.org/menu-spec/latest/apa.html -->
       <category name="Game">
@@ -29,4 +99,6 @@
 
   </application>
 
+
+
 </PXML>
diff --git a/pandora/previews/retroarch-phoenix.png b/pandora/previews/retroarch-phoenix.png
new file mode 100644
index 0000000000..1ad9e92f7b
Binary files /dev/null and b/pandora/previews/retroarch-phoenix.png differ
diff --git a/pandora/previews/retroarch.png b/pandora/previews/retroarch.png
index 0bad4e70e7..57da421ab4 100644
Binary files a/pandora/previews/retroarch.png and b/pandora/previews/retroarch.png differ
diff --git a/pandora/retroarch/retroarch.cfg b/pandora/retroarch/retroarch.cfg
index 1c6ebdf4a4..3f9f5aab4f 100644
--- a/pandora/retroarch/retroarch.cfg
+++ b/pandora/retroarch/retroarch.cfg
@@ -61,9 +61,6 @@ video_fullscreen = false
 # Force 16-bit colors. Apparently some video cards in use today have troubles with 32-bit ...
 #video_force_16bit = true
 
-# Forcibly disable composition. Only works in Windows Vista/7 for now.
-# video_disable_composition = false
-
 # Video vsync.
 #video_vsync = false
 
@@ -86,14 +83,10 @@ video_aspect_ratio_auto = true
 # Forces cropping of overscanned frames. Crops away top 7 scanlines and 8 bottom scanlines. (15/15 for interlaced frames).
 # video_crop_overscan = false
 
-# Path to Cg shader.
-# video_cg_shader = "/path/to/cg/shader.cg"
-
-# Path to bSNES XML shader (GLSL only). If both Cg shader path and XML shader path are defined, 
-# Cg shader will take priority unless overridden in video_shader_type.
+# Path to bSNES XML shader (GLSL only).
 # video_bsnes_shader = "/path/to/bsnes/xml/shader.shader"
 
-# Which shader type to use. Valid values are "cg", "bsnes", "none" and "auto"
+# Which shader type to use. Valid values are "bsnes", "none" and "auto"
 # video_shader_type = auto
 
 # Defines a directory where XML shaders are kept.
@@ -209,23 +202,23 @@ input_player1_left = left
 input_player1_right = right
 input_player1_up = up
 input_player1_down = down
-# input_player1_l2 =
-# input_player1_r2 =
-# input_player1_l3 =
-# input_player1_r3 =
+input_player1_l2 = num1
+input_player1_r2 = backspace
+input_player1_l3 = e
+input_player1_r3 = i
 
 # Two analog sticks (DualShock-esque).
 # Bound as usual, however, if a real analog axis is bound,
 # it can be read as a true analog.
 # Positive X axis is right, Positive Y axis is down.
-# input_player1_l_x_plus =
-# input_player1_l_x_minus =
-# input_player1_l_y_plus =
-# input_player1_l_y_minus =
-# input_player1_r_x_plus =
-# input_player1_r_x_minus =
-# input_player1_r_y_plus =
-# input_player1_r_y_minus =
+input_player1_l_x_plus_axis = +0
+input_player1_l_x_minus_axis = -0
+input_player1_l_y_plus_axis = +1
+input_player1_l_y_minus_axis = -1
+input_player1_r_x_plus_axis = +2
+input_player1_r_x_minus_axis = -2
+input_player1_r_y_plus_axis = +3
+input_player1_r_y_minus_axis = -3
 
 # If desired, it is possible to override which joypads are being used for player 1 through 5. First joypad available is 0.
 # input_player1_joypad_index = 0
diff --git a/pandora/scripts/env-vars.sh b/pandora/scripts/env-vars.sh
new file mode 100755
index 0000000000..22a81d4fd2
--- /dev/null
+++ b/pandora/scripts/env-vars.sh
@@ -0,0 +1,17 @@
+#!/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"
+
+if [ -d /mnt/utmp/retroarch/share ] ; then
+	export XDG_DATA_DIRS=/mnt/utmp/retroarch/share:$XDG_DATA_DIRS:/usr/share
+fi
+
+# use notaz's optimized driver
+export SDL_VIDEODRIVER="omapdss"
+export SDL_AUDIODRIVER="alsa"
+
+# integral scaling
+export SDL_OMAP_LAYER_SIZE="pixelperfect"
+
diff --git a/pandora/scripts/retroarch-phoenix.sh b/pandora/scripts/retroarch-phoenix.sh
new file mode 100755
index 0000000000..4be6677d9d
--- /dev/null
+++ b/pandora/scripts/retroarch-phoenix.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+source "/mnt/utmp/retroarch/scripts/env-vars.sh"
+
+# load the libstdc++ from gcc-4.7 because phoenix doesn't build in anything less
+exec env LD_PRELOAD=/mnt/utmp/retroarch/lib/libstdc++.so.6 retroarch-phoenix "${@}"
+
diff --git a/pandora/scripts/retroarch.sh b/pandora/scripts/retroarch.sh
index 0805da9939..0a6e88fc49 100755
--- a/pandora/scripts/retroarch.sh
+++ b/pandora/scripts/retroarch.sh
@@ -1,11 +1,6 @@
 #!/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"
 
-if [ -d /mnt/utmp/retroarch/share ] ; then
-	export XDG_DATA_DIRS=/mnt/utmp/retroarch/share:$XDG_DATA_DIRS:/usr/share
-fi
+source "/mnt/utmp/retroarch/scripts/env-vars.sh"
 
 # choose a libretro core.
 cd /mnt/utmp/retroarch/lib
@@ -54,13 +49,6 @@ ROM=$(zenity --file-selection --file-filter="${FILTER}" "${LASTROM}")
 
 echo "$ROM" > "${BACKEND}-lastrom.txt"
 
-# use notaz's optimized driver
-export SDL_VIDEODRIVER="omapdss"
-export SDL_AUDIODRIVER="alsa"
-
-# integral scaling
-export SDL_OMAP_LAYER_SIZE="pixelperfect"
-
 # 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}" "${@}"