diff --git a/XBMC-cfgs/extra/gp_autodetect_xbmc.sh b/XBMC-cfgs/extra/gp_autodetect_xbmc.sh
index c5df847..dd1c90e 100644
--- a/XBMC-cfgs/extra/gp_autodetect_xbmc.sh
+++ b/XBMC-cfgs/extra/gp_autodetect_xbmc.sh
@@ -30,12 +30,15 @@ do
     echo "[begin:] PS3 / USB controller changed"
     
     #first attempt
-    service xboxdrv restart
-    echo "sending gamepad reconfiguration request"
-    killall xbmc.bin -SIGUSR1
-    
+    service xboxdrv stop
+    killall -9 xboxdrv
+    service xboxdrv start
+
     #second attempt
-    service xboxdrv restart
+    service xboxdrv stop
+    killall -9 xboxdrv
+    service xboxdrv start
+
     echo "sending gamepad reconfiguration request"
     killall xbmc.bin -SIGUSR1
     
diff --git a/XBMC-cfgs/extra/rescan b/XBMC-cfgs/extra/rescan
index b075723..f3a8c4b 100755
--- a/XBMC-cfgs/extra/rescan
+++ b/XBMC-cfgs/extra/rescan
@@ -1,12 +1,12 @@
 #!/bin/bash
 ### BEGIN INIT INFO
 # Provides: rescan
-# Required-Start:    
-# Required-Stop:     
+# Required-Start: $remote_fs
+# Required-Stop: $remote_fs
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Start rescan
-# Short-Description: This script starts, stops or restarts /usr/share/applications/gp_autodetect_xbmc.sh from project RetroRig. For more information see there.
+# Description: This script starts, stops or restarts /usr/share/applications/gp_autodetect_xbmc.sh from project RetroRig. For more information see there.
 ### END INIT INFO
 #
 # Author:      beauman @ jc techno labs
@@ -99,6 +99,10 @@ case "$1" in
     $0 stop
     $0 start
     ;;
+  force-reload)
+    $0 stop
+    $0 start
+    ;;
   status)
     if rescanIsRunning; then
       echo "rescan is running"
diff --git a/init-scripts/ps3_usb_controller/xboxdrv b/init-scripts/ps3_usb_controller/xboxdrv
index 35fc97d..fb0404a 100755
--- a/init-scripts/ps3_usb_controller/xboxdrv
+++ b/init-scripts/ps3_usb_controller/xboxdrv
@@ -16,7 +16,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="XBOX Controller Service"
 NAME=xboxdrv
 DAEMON=/usr/bin/$NAME
-DAEMON_ARGS="-D -d --deadzone 4000 --dbus disabled --detach"
+DAEMON_ARGS="-D -d --dbus disabled --detach"
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
@@ -52,6 +52,7 @@ do_stop()
 {
     start-stop-daemon -K -o -q -x $DAEMON
     sleep 1
+    killall -9 xboxdrv
 }
 
 case "$1" in
diff --git a/retrorig-setup.sh b/retrorig-setup.sh
index d2af62e..412fd0d 100755
--- a/retrorig-setup.sh
+++ b/retrorig-setup.sh
@@ -167,7 +167,7 @@ if [ "$script_invoke_path" == "/usr/bin/retrorig-setup" ]; then
 
 	#install method via system folder
 	
-	scriptdir=/usr/lib/RetroRig
+	scriptdir=/usr/share/RetroRig
 	
 else
 
diff --git a/scriptmodules/helpers.shinc b/scriptmodules/helpers.shinc
index e32715d..b9a4b5a 100644
--- a/scriptmodules/helpers.shinc
+++ b/scriptmodules/helpers.shinc
@@ -1049,7 +1049,7 @@ function h_filechecker()
 
 function h_pkgcheck()
 {
-    PKG_OK=$($cmd_remove_pkg "$1" | egrep -w "Status|Package|Version")
+    PKG_OK=$($cmd_query_pkg "$1" | egrep -w "Status|Package|Version")
     echo "Checking for some pkg/lib: $PKG_OK"
     if [ "" == "$PKG_OK" ]; then
         echo "NOT INSTALLED: $1" >> "$rootdir/logs/debug.log"
diff --git a/scriptmodules/setup.shinc b/scriptmodules/setup.shinc
index 6701e49..f8fb5e7 100644
--- a/scriptmodules/setup.shinc
+++ b/scriptmodules/setup.shinc
@@ -531,18 +531,15 @@ function rrs_add_standard_repos()
 					echo "deb http://ppa.launchpad.net/beauman/retrorig/ubuntu trusty main" >\
 					  /etc/apt/sources.list.d/beauman-ubuntu-retrorig-trusty.list
 
-					echo "deb http://ppa.launchpad.net/beauman/retrorig-testing/ubuntu trusty main" >\
-					  /etc/apt/sources.list.d/beauman-ubuntu-retrorig-testing-trusty.list
-
 					echo "copying missing libraries for Ubuntu 14.10"
-					mkdir -p /usr/lib/RetroRig
-					cd /usr/lib/RetroRig
+					mkdir -p /usr/share/RetroRig
+					cd /usr/share/RetroRig
 					wget --tries=50 -P /tmp "http://www.libregeek.org/RetroRig/libs/libs.Ubuntu.14.10.tar.bz"
 					tar xvfj /tmp/libs.Ubuntu.14.10.tar.bz
 
-					echo "installing librariessystem wide"
+					echo "installing libraries system wide"
 					cd /etc/ld.so.conf.d/
-					echo /usr/lib/RetroRig > RetroRig.conf
+					echo /usr/share/RetroRig > RetroRig.conf
 					ldconfig
 				
 #					TODO
@@ -554,7 +551,7 @@ function rrs_add_standard_repos()
 #					apt-get update
 #
 #					# remove supplemental libraries
-#					rm -rf /usr/lib/RetroRig
+#					rm -rf /usr/share/RetroRig
 #					rm /etc/ld.so.conf.d/RetroRig.conf
 #					ldconfig
 					;;
@@ -676,8 +673,8 @@ function rrs_software()
 	# install binaries
 	$cmd_install_pkg xboxdrv curl python-software-properties \
 	pkg-config software-properties-common dconf-tools jstest-gtk \
-	qjoypad sixad libusb-0.1-4 antimicro bluez getpos unclutter \
-	joydetect sudo
+	sixad libusb-0.1-4 antimicro bluez getpos unclutter \
+	joydetect sudo ttf-dejavu-core ttf-dejavu-core ttf-liberation
 
 	#wii motion support
 	$cmd_install_pkg libcwiid1 lswm wmgui wminput
@@ -755,26 +752,28 @@ function rrs_debug()
 	gsettings list-recursively "org.gnome.desktop.screensaver" | grep "ubuntu-lock-on-suspend" >> "$rootdir/logs/debug.log"	
 	gsettings list-recursively "org.gnome.desktop.session" | grep "idle-delay" >> "$rootdir/logs/debug.log"
 
-	# Source built / pre-built
-	h_filechecker "$rootdir/emulators/PPSSPP/ppsspp-0.9.8-SDL-pk64"
-	h_filechecker "/ust/bin/PPSSPPSDL"
-
 	# pkg checks
-	echo -e "\nCheck for needed pkgs installed via apt: " >> "$rootdir/logs/debug.log"
+	echo -e "\nCheck for needed pkgs: " >> "$rootdir/logs/debug.log"
 	h_pkgcheck "stella"
+	h_pkgcheck "mednafen"
+	h_pkgcheck "mess"
+	h_pkgcheck "mame"
+	h_pkgcheck "ppsspp"
+	h_pkgcheck "dolphin-emu"
+	h_pkgcheck "mupen64plus"
+	h_pkgcheck "pcsx2"
+	h_pkgcheck "gens"
+	
 	h_pkgcheck "python-software-properties"
 	h_pkgcheck "xbmc"
 	h_pkgcheck "dconf-tools"
 	h_pkgcheck "xboxdrv"
 	h_pkgcheck "curl"
-	h_pkgcheck "xbmc"
-	h_pkgcheck "mednafen"
-	h_pkgcheck "mess"
-	h_pkgcheck "mame"
-	h_pkgcheck "qjoypad"
+	h_pkgcheck "getpos"
 	h_pkgcheck "jstest-gtk"
+	h_pkgcheck "antimicro"
 
-   	echo -e "\nEnd of log file" >> "$rootdir/logs/debug.log" >> "$rootdir/logs/debug.log"
+	echo -e "\nEnd of log file" >> "$rootdir/logs/debug.log" >> "$rootdir/logs/debug.log"
 
 	dialog --backtitle "LibreGeek.org - RetroRig Setup. Installation folder: $rootdir for user $	user" --msgbox "Debug log was generated in $rootdir/logs/debug.log. Additional logs can be found in the folder $rootdir/logs/." 10 60 
 
@@ -960,7 +959,7 @@ function rrs_done()
 	# Please see commit efeb2bd for legacy code. This message will be 
 	# Removed in due time.
 
-       	dialog --backtitle "LibreGeek.org - RetroRig Setup. Installation folder: $rootdir for user $user" --msgbox "Finished main install tasks.\n\nYou now have to copy roms to the roms folders. \nThis can be done via SSH, Samba, or via your graphic folder manager (please see settings menu for more)\n\nAll current config folders used were appended with .old for restoration purposes.\n\n" 18 50
+       	dialog --backtitle "LibreGeek.org - RetroRig Setup. Installation folder: $rootdir for user $user" --msgbox "Finished main install tasks.\n\nYou now have to copy roms to the roms folders. \nThis can be done via SSH, Samba, or via your graphic folder manager (please see settings menu for more)\n\nAll current config folders used were appended with .old for restoration purposes.\n\nDon't forget to install the latest graphics drivers. Oftentimes proprietary driver help to improve gaming performance." 18 50
 
 	# correct permissions
 	h_correct_perms
diff --git a/scriptmodules/setup.shinc.orig b/scriptmodules/setup.shinc.orig
deleted file mode 100644
index ca7b324..0000000
--- a/scriptmodules/setup.shinc.orig
+++ /dev/null
@@ -1,1107 +0,0 @@
-#!/bin/bash
-#
-# RetroRig setup modules
-# This is a small script to copy over configuration files for emulators
-# append a "-x" on the end above for debugging if need be
-# Please report any errors via a pull request
-# You can also reach me on twitter: @N3RD42
-#
-
-function rrs_prepareFolders()
-{
-	echo "Creating folders for ROMs, Artwork, Saves, and dotfiles"
-	# We pass -p below,so all folders below are created for 
-	# a given path
-
-	pathlist=()
-
-	# create autostart folder for manual desktop entries
-	pathlist+=("$home/.config/autostart/")
-
-	#emulator base directory
-	#pathlist+=("$rootdir/emulators")
-
-	#setup skelton folders for XBMC Rom Collection Browser
-	#ROMs
-	pathlist+=("$rootdir/ROMs/Atari 2600")
-	pathlist+=("$rootdir/ROMs/Atari Lynx")
-	pathlist+=("$rootdir/ROMs/Gamecube")
-	pathlist+=("$rootdir/ROMs/MAME")
-	pathlist+=("$rootdir/ROMs/mupen64plus")
-	pathlist+=("$rootdir/ROMs/NES")
-	pathlist+=("$rootdir/ROMs/SNES")
-	pathlist+=("$rootdir/ROMs/Sega Master System")
-	pathlist+=("$rootdir/ROMs/Sega Game Gear")
-	pathlist+=("$rootdir/ROMs/Sega Genesis")
-	pathlist+=("$rootdir/ROMs/Sega CD")
-	pathlist+=("$rootdir/ROMs/Sega 32X")
-	pathlist+=("$rootdir/ROMs/GB")
-	pathlist+=("$rootdir/ROMs/GBC")
-	pathlist+=("$rootdir/ROMs/GBA")
-	pathlist+=("$rootdir/ROMs/TurboGraphx 16")
-	pathlist+=("$rootdir/ROMs/Neo Geo/CDZ")
-	pathlist+=("$rootdir/ROMs/Neo Geo/AES")
-	pathlist+=("$rootdir/ROMs/PSP")
-	pathlist+=("$rootdir/ROMs/PS1")
-	pathlist+=("$rootdir/ROMs/PS2")
-	pathlist+=("$rootdir/ROMs/Wii")
-
-	#Artwork 
-	pathlist+=("$rootdir/Artwork/Atari 2600")
-	pathlist+=("$rootdir/Artwork/Atari Lynx")
-	pathlist+=("$rootdir/Artwork/Gamecube")
-	pathlist+=("$rootdir/Artwork/Nintendo 64")
-	pathlist+=("$rootdir/Artwork/NES")
-	pathlist+=("$rootdir/Artwork/SNES")
-	pathlist+=("$rootdir/Artwork/Sega Master System")
-	pathlist+=("$rootdir/Artwork/Sega Game Gear")
-	pathlist+=("$rootdir/Artwork/Sega Genesis")
-	pathlist+=("$rootdir/Artwork/Sega CD")
-	pathlist+=("$rootdir/Artwork/Sega 32X")
-	pathlist+=("$rootdir/Artwork/GB")
-	pathlist+=("$rootdir/Artwork/GBC")
-	pathlist+=("$rootdir/Artwork/GBA")
-	pathlist+=("$rootdir/Artwork/TurboGraphx 16")
-	pathlist+=("$rootdir/Artwork/Neo Geo/CDZ")
-	pathlist+=("$rootdir/Artwork/Neo Geo/AES")
-	pathlist+=("$rootdir/Artwork/PSP")
-	pathlist+=("$rootdir/Artwork/PS1")
-	pathlist+=("$rootdir/Artwork/PS2")
-	pathlist+=("$rootdir/Artwork/Wii")
-	pathlist+=("$rootdir/Artwork/XBMC")
-
-	#Artwork - MAME offline scraper
-	pathlist+=("$rootdir/Artwork/MAME")
-	pathlist+=("$rootdir/Artwork/MAME/boxfront")
-	pathlist+=("$rootdir/Artwork/MAME/RCB")
-	pathlist+=("$rootdir/Artwork/MAME/cabinet")
-	pathlist+=("$rootdir/Artwork/MAME/marquee")
-	pathlist+=("$rootdir/Artwork/MAME/action")
-	pathlist+=("$rootdir/Artwork/MAME/title")
-	pathlist+=("$rootdir/Artwork/MAME/gameplay")
-
-	#Saves (if any)
-	pathlist+=("$rootdir/Saves/Atari 2600")
-	pathlist+=("$rootdir/Saves/Atari Lynx")
-	pathlist+=("$rootdir/Saves/MAME")
-	pathlist+=("$rootdir/Saves/dolphin-emu/GC")
-	pathlist+=("$rootdir/Saves/dolphin-emu/Wii")
-	pathlist+=("$rootdir/Saves/mupen64plus")
-	pathlist+=("$rootdir/Saves/mednafen")
-	pathlist+=("$rootdir/Saves/GensGS")
-	pathlist+=("$rootdir/Saves/GB")
-	pathlist+=("$rootdir/Saves/GBC")
-	pathlist+=("$rootdir/Saves/GBA")
-	pathlist+=("$rootdir/Saves/TurboGraphx 16")
-	pathlist+=("$rootdir/Saves/Neo Geo/CDZ")
-	pathlist+=("$rootdir/Saves/Neo Geo/AES")
-	pathlist+=("$rootdir/Saves/ppsspp")
-	pathlist+=("$rootdir/Saves/pcsx2")
-
-	# create dotfiles
-	pathlist+=("$home/.retrorig")
-	pathlist+=("$config_home/.qjoypad3")
-	pathlist+=("$config_home/.config/antimicro")
-	pathlist+=("$config_home/.dolphin-emu/GC/Config")
-	pathlist+=("$config_home/.dolphin-emu/Wii/Config")
-	pathlist+=("$config_home/.config/mupen64plus")
-	pathlist+=("$config_home/.config/ppsspp/PSP/SYSTEM")
-	pathlist+=("$config_home/.mame/cfg")
-	pathlist+=("$config_home/.mess")
-	pathlist+=("$config_home/.gens")
-	pathlist+=("$config_home/.config/pcsx2/inis")
-	pathlist+=("$config_home/.config/pcsx2/memcards")
-	pathlist+=("$config_home/.mess/cfg")
-	pathlist+=("$config_home/.stella")
-	pathlist+=("$config_home/.mednafen")
-
-	# xbmc folders
-	pathlist+=("$xbmc_home/userdata/keymaps")
-
-	#BIOS folder(s)
-	pathlist+=("$rootdir/BIOS/MESS")
-	pathlist+=("$rootdir/BIOS/MAME")
-	pathlist+=("$rootdir/BIOS/Gens")
-	# Note: PS1 BIOS path is set in mednafen under:
-	# filesys.path_firmware
-	pathlist+=("$rootdir/BIOS/Mednafen")
-	pathlist+=("$rootdir/BIOS/PCSX2")
-
-	# folder for savestates 
-	# Moved if statements below to backup folders
-
-	#Configs (not needed at the moment)
-	# pathlist+=("$rootdir/Configs")
-
-	# quotes needed on entry to preven globbing on directory creation!
-	# Expanding arrays involves [@] and {}
-	for entry in "${pathlist[@]}"
-	do
-		if [[ ! -d "$entry" ]]; then
-			mkdir -p "$entry" 
-			chown "$user" "$entry"
-			chgrp "$user" "$entry"
-		fi
-	done
-
-	# correct permissions
-	h_correct_perms
-
-	#backup existing state saves, if a backup folder does not exist, and the save state folder a real directory is
-	if [ ! -d "$home/.retrorig/.dolphin-emu/StateSaves.old" ]; then
-		if [ ! -L "$home/.retrorig/.dolphin-emu/StateSaves" ]; then
-			if [ -d "$home/.retrorig/.dolphin-emu/GC/StateSaves" ] || [ -d "$home/.retrorig/.dolphin-emu/Wii/StateSaves" ]; then
-				mv -f "$home/.retrorig/.dolphin-emu/GC/StateSaves" "$home/.retrorig/.dolphin-emu/GC/StateSaves.old"
-				mv -f "$home/.retrorig/.dolphin-emu/Wii/StateSaves" "$home/.retrorig/.dolphin-emu/Wii/StateSaves.old"
-				dolphin_backup=true
-			fi
-		fi
-	fi
-
-	if [ ! -d "$home/.retrorig/.config/mupen64plus/save.old" ]; then
-		if [ ! -L "$home/.retrorig/.config/mupen64plus/save" ]; then
-			if [ -d "$home/.retrorig/.config/mupen64plus/save" ]; then
-				mv -f "$home/.retrorig/.config/mupen64plus/save" "$home/.retrorig/.config/mupen64plus/save.old"
-				mupen64plus_backup=true
-			fi
-		fi
-	fi
-
-	if [ ! -d "$home/.retrorig/.mednafen/sav.old" ]; then
-		if [ ! -L "$home/.retrorig/.mednafen/sav" ]; then
-			if [ -d "$home/.retrorig/.mednafen/sav" ]; then
-				mv -f "$home/.retrorig/.mednafen/sav" "$home/.retrorig/.mednafen/sav.old"
-				mednafen_backup=true
-			fi
-		fi
-	fi
-
-	if [ ! -d "$home/.retrorig/.gens/StateSaves.old" ]; then
-		if [ ! -L "$home/.retrorig/.gens/StateSaves" ]; then
-			if [ -d "$home/.retrorig/.gens/StateSaves" ]; then
-				mv -f "$home/.retrorig/.gens/StateSaves" "$home/.retrorig/.gens/StateSaves.old"
-				gens_backup=true
-			fi
-		fi
-	fi
-
-	if [ ! -d "$home/.retrorig/.config/ppsspp/PSP/SAVEDATA.old" ]; then
-		if [ ! -L "$home/.retrorig/.config/ppsspp/PSP/SAVEDATA" ]; then
-			if [ -d "$home/.retrorig/.config/ppsspp/PSP/SAVEDATA" ]; then
-				mv -f "$home/.retrorig/.config/ppsspp/PSP/SAVEDATA" "$home/.retrorig/.config/ppsspp/PSP/SAVEDATA.old"
-				ppsspp_backup=true
-			fi
-		fi
-	fi
-
-	if [ ! -d "$home/.retrorig/.config/pcsx2/sstates.old" ]; then
-		if [ ! -L "$home/.retrorig/.config/pcsx2/sstates" ]; then
-			if [ -d "$home/.retrorig/.config/pcsx2/sstates" ]; then
-				mv -f "$home/.retrorig/.config/pcsx2/sstates" "$home/.retrorig/.config/pcsx2/sstates.old"
-				pcsx2_backup=true
-			fi
-		fi
-	fi
-
-	#remove old links
-	rm -f "$home/.retrorig/.dolphin-emu/StateSaves"
-	rm -f "$home/.retrorig/.dolphin-emu/GC/StateSaves"
-	rm -f "$home/.retrorig/.dolphin-emu/Wii/StateSaves"
-	rm -f "$home/.retrorig/.config/mupen64plus/save"
-	rm -f "$home/.retrorig/.mednafen/sav"
-	rm -f "$home/.retrorig/.gens/StateSaves"
-	rm -f "$home/.retrorig/.config/ppsspp/PSP/SAVEDATA"
-	rm -f "$home/.retrorig/.config/pcsx2/sstates"
-
-	#create links 
-	ln -sf "$rootdir/Saves/dolphin-emu/GC" "$home/.retrorig/.dolphin-emu/GC/StateSaves"
-	ln -sf "$rootdir/Saves/dolphin-emu/Wii" "$home/.retrorig/.dolphin-emu/Wii/StateSaves"
-	ln -sf "$rootdir/Saves/mupen64plus" "$home/.retrorig/.config/mupen64plus/save"
-	ln -sf "$rootdir/Saves/mednafen" "$home/.retrorig/.mednafen/sav"
-	ln -sf "$rootdir/Saves/GensGS" "$home/.retrorig/.gens/StateSaves"
-	ln -sf "$rootdir/Saves/ppsspp" "$home/.retrorig/.config/ppsspp/PSP/SAVEDATA"
-	ln -sf "$rootdir/Saves/pcsx2" "$home/.retrorig/.config/pcsx2/sstates"
-
-	#restore backup
-	if [ "$dolphin_backup" == "true" ]; then
-		# Place legacy save folder in its own area, as to not confuse the new directory split
-		cp -rf "$home/.retrorig/.dolphin-emu/StateSaves.old/*" "$home/.retrorig/.dolphin-emu/legacy/StateSaves"
-		# Restore split directory save files
-		cp -rf "$home/.retrorig/.dolphin-emu/GC/StateSaves.old/*" "$home/.retrorig/.dolphin-emu/GC/StateSaves"
-		cp -rf "$home/.retrorig/.dolphin-emu/Wii/StateSaves.old/*" "$home/.retrorig/.dolphin-emu/Wii/StateSaves"
-	fi
-
-	if [ "$mupen64plus_backup" == "true" ]; then
-		cp -rf "$home/.retrorig/.config/mupen64plus/StateSaves.old/*" "$home/.retrorig/.config/mupen64plus/StateSaves"
-	fi
-
-	if [ "$mednafen_backup" == "true" ]; then
-		cp -rf "$home/.retrorig/.mednafen/sav.old/*" "$home/.retrorig/.mednafen/sav"
-	fi
-
-	if [ "$gens_backup" == "true" ]; then
-		cp -rf "$home/.retrorig/.gens/StateSaves.old/*" "$home/.retrorig/.gens/StateSaves"
-	fi
-
-	if [ "$ppsspp_backup" == "true" ]; then
-		cp -rf "$home/.retrorig/.config/ppsspp/PSP/SAVEDATA.old/*" "$home/.retrorig/.config/ppsspp/PSP/SAVEDATA"
-	fi
-
-	if [ "$pcsx2_backup" == "true" ]; then
-		cp -rf "$home/.retrorig/.config/pcsx2/sstates.old/*" "$home/.retrorig/.config/pcsx2/sstates"
-	fi
-
-	# correct permissions
-	h_correct_perms
-
-}
-
-function rrs_gamepad ()
-{
-
-# some residual chown/chmod text shows up at times, clear
-clear
-
-cmd=(dialog --backtitle "LibreGeek.org RetroRig Installer" --menu "| Gamepad Select | \
-			 Request any new Gamepads via github!" 16 62 16)
-options=(1 "Xbox 360 Controller (wireless)"
-	 2 "Xbox 360 Controller (USB)"
-	 3 "Sony PS3 Sixaxis (Bluetooth)"
-	 4 "Sony PS3 Sixaxis (USB)"
-	 5 "Exit gamepad selection")
-
-	#make menu choice
-	selection=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)
-	#functions
-
-	for choice in $selection
-	do
-		case $choice in
-
-		1)
-		gp_common
-		gp_x360_wireless
-		h_restore_bios_cfg
-		;;
-
-		2)
-		gp_common
-		gp_x360_usb
-		h_restore_bios_cfg
-		;;
-
-		3)
-		gp_common
-		gp_ps3_blu
-		h_restore_bios_cfg
-		;;
-
-		4)
-		gp_common
-		gp_ps3_usb
-		h_restore_bios_cfg
-		;;
-
-		5)
-		return
-		;;
-
-		esac
-	done
-	
-	wii_motion_controller_for_dolphin
-	enable_autostart_RetroRig
-	
-}
-
-
-function rrs_post_install()
-{
-
-	# Based on the type of type Desktop Environment
-	# This function targets DE-specific areas for screensavers,
-	# power functions, shortcuts and more.
-
-	# $XDG_CURRENT_DESKTOP will tell you what DE you are using.
-	rrDE=$XDG_CURRENT_DESKTOP
-
-	case $rrDE in
-		Unity)
-
-			# Disable screensaver, XBMC will manage this
-			# Export display to allow gsettings running in terminal window
-			export DISPLAY=:0.0
-			gsettings set org.gnome.desktop.screensaver lock-enabled false
-			gsettings set org.gnome.desktop.screensaver ubuntu-lock-on-suspend false
-			gsettings set org.gnome.desktop.session idle-delay 3600
-
-			# Create Unity launcher icon from existing /usr/share/applications/RetroRig.desktop
-			# This only applies to Unity desktop users.
-			gsettings set com.canonical.Unity.Launcher favorites "$(gsettings get com.canonical.Unity.Launcher favorites | sed "s/, *'RetroRig.desktop' *//g" | sed "s/'RetroRig.desktop' *, *//g" | sed -e "s/]$/, 'RetroRig.desktop'")"
-			;;
-
-		Gnome)
-			# Nothing to see here yet
-			;;
-
-		Cinnamon)
-			# Nothing to see here yet
-			;;			
-
-		*)
-		;;
-	esac
-
-}
-
-function rrs_discover_distro()
-{
-
-	# Users that may run this on a non-Linux OS:
-	UNAME=`uname`
-	if [ "$UNAME" != "Linux" ]; then
-	   echo "Error: Unsupported Operating System"
-	   exit 1
-	fi
-
-	# OS Distro
-	OS_ID_STRING=$(lsb_release -a 2>/dev/null|grep "Distributor ID")
-	OS_TYPE=$(echo $OS_ID_STRING|cut -f 3 -d ' ')
-
-	# Release
-	OS_RELEASE_STRING=$(lsb_release -a 2>/dev/null|grep "Release")
-	OS_RELEASE=$(echo $OS_RELEASE_STRING | sed s/' '//g | cut -f 2 -d ':')
-
-	# Arch
-	case $(uname -m) in
-	*64)
-		echo "64-bit"
-		;;
-	*)
-		echo "32-bit"
-		;;
-	esac
-
-}
-
-function rrs_source_syscalls()
-{
-	# Source the correct syscalls for platform
-	# This largely alludes to the default package manager
-	echo "Setting syscalls based on default package manager..."
-	
-	case $OS_TYPE in
-		Ubuntu)
-
-			case $OS_RELEASE in
-
-				14.04)
-					source "$scriptdir/scriptmodules/syscalls-deb.shinc"
-					platform_check="Yes"
-					pkg_manager="apt/aptitude"
-					init_system="upstart"
-					;;
-
-				14.10)
-					source "$scriptdir/scriptmodules/syscalls-deb.shinc"
-					platform_check="Yes"
-					pkg_manager="apt/aptitude"
-					init_system="upstart"
-					;;
-
-				*)
-
-					# This does not exit the script at this time, but will once 
-					# All proper support distros that work are identifed.
-					platform_check="No"
-					pkg_manager="N/A"
-					init_system="N/A"
-					#clear
-					#exit
-					;;
-			esac
-			;;
-
-		LinuxMint)
-
-			case $OS_RELEASE in
-
-				17)
-					source "$scriptdir/scriptmodules/syscalls-deb.shinc"
-					platform_check="Yes"
-					pkg_manager="apt/aptitude"
-					init_system="upstart"
-					;;
-
-
-				*)
-
-					# This does not exit the script at this time, but will once 
-					# All proper support distros that work are identifed.
-					platform_check="No"
-					pkg_manager="N/A"
-					init_system="N/A"
-					#clear
-					#exit
-					;;
-			esac
-
-			;;
-
-		Deepin)
-
-			case $OS_RELEASE in
-
-				2014)
-					source "$scriptdir/scriptmodules/syscalls-deb.shinc"
-					platform_check="Yes"
-					pkg_manager="apt/aptitude"
-					init_system="upstart"
-					;;
-
-
-				*)
-
-					# This does not exit the script at this time, but will once 
-					# All proper support distros that work are identifed.
-					platform_check="No"
-					pkg_manager="N/A"
-					init_system="N/A"
-					#clear
-					#exit
-					;;
-			esac
-
-			;;
-
-		*)
-			# This does not exit the script at this time, but will once 
-			# All proper support distros that work are identifed.
-			platform_check="No"
-			pkg_manager="N/A"
-			init_system="N/A"
-			#clear
-			#exit
-		;;
-
-	esac
-	# Display system information
-	echo "Supported Platform? $platform_check"
-	echo "Distro: $OS_TYPE"
-	echo "Release: $OS_RELEASE"
-	echo "Default init system: $init_system"
-	echo "Primary package management system: $pkg_manager"
-	echo ""
-	echo "#####################################################"
-	sleep 4s
-
-}
-
-function rrs_add_standard_repos()
-{
-	########################################################
-	# install package repositories and missing libraries
-	########################################################
-
-	case $OS_TYPE in
-		"Ubuntu")
-			#find version of operating system
-
-
-			###############################################################
-			# Add our standport Debian repositories for various pkgs
-			###############################################################
-			# add respository for RetroRig backends (xbmc, mednafen,...)
-			$cmd_add_repo ppa:beauman/retrorig
-			# Add repository for additional pkgs (retrorig-setup, joydetect)
-			$cmd_add_repo ppa:mdeguzis/retrorig
-
-			case $OS_RELEASE in
-
-				14.04)
-
-					echo "running Ubuntu 14.04 LTS"
-					;;
-
-				14.10)
-
-					echo "running Ubuntu 14.10"
-
-					#add beauman's trusty repository 
-					echo "deb http://ppa.launchpad.net/beauman/retrorig/ubuntu trusty main" >\
-					  /etc/apt/sources.list.d/beauman-ubuntu-retrorig-trusty.list
-
-					echo "deb http://ppa.launchpad.net/beauman/retrorig-testing/ubuntu trusty main" >\
-					  /etc/apt/sources.list.d/beauman-ubuntu-retrorig-testing-trusty.list
-
-					echo "copying missing libraries for Ubuntu 14.10"
-					mkdir -p /usr/lib/RetroRig
-					cd /usr/lib/RetroRig
-					wget --tries=50 -P /tmp "http://www.libregeek.org/RetroRig/libs/libs.Ubuntu.14.10.tar.bz"
-					tar xvfj /tmp/libs.Ubuntu.14.10.tar.bz
-
-					echo "installing librariessystem wide"
-					cd /etc/ld.so.conf.d/
-					echo /usr/lib/RetroRig > RetroRig.conf
-					ldconfig
-				
-#					TODO
-#					DEINSTALLATION CODE
-#
-#					# remove PPA
-#					rm -f /etc/apt/sources.list.d/beauman-ubuntu-retrorig-trusty.list*
-#					rm -f /etc/apt/sources.list.d/beauman-ubuntu-retrorig-testing-trusty.list*
-#					apt-get update
-#
-#					# remove supplemental libraries
-#					rm -rf /usr/lib/RetroRig
-#					rm /etc/ld.so.conf.d/RetroRig.conf
-#					ldconfig
-					;;
-
-				*)
-					;;
-			esac
-		;;
-
-		LinuxMint)
-
-			###############################################################
-			# Add our standport Debian repositories for various pkgs
-			###############################################################
-			# add respository for RetroRig backends (xbmc, mednafen,...)
-			$cmd_add_repo ppa:beauman/retrorig
-			# Add repository for additional pkgs (retrorig-setup, joydetect)
-			$cmd_add_repo ppa:mdeguzis/retrorig
-
-			case $OS_RELEASE in
-				"17")
-					echo "running Linux Mint 17 Qiana"
-					
-						# latest X11 drivers
-						$cmd_add_repo ppa:xorg-edgers/ppa
-					;;
-
-				*)
-					;;
-			esac
-		;;
-		Deepin)
-
-			###############################################################
-			# Add our standport Debian repositories for various pkgs
-			###############################################################
-			# add respository for RetroRig backends (xbmc, mednafen,...)
-			$cmd_add_repo ppa:beauman/retrorig
-			# Add repository for additional pkgs (retrorig-setup, joydetect)
-			$cmd_add_repo ppa:mdeguzis/retrorig
-
-			case $OS_RELEASE in
-				"2014")
-					echo "running Deepin 2014"
-					;;
-
-				*)
-					;;
-			esac
-		;;
-
-		*)
-			;;
-	esac
-}
-
-function rrs_emulators()
-{
-	__postMSGs=""
-
-	clear
-	echo "Binaries-based installation"
-
-	# install emulators
-	em_install_mupen64plus 
-	em_install_mame
-	em_install_mess
-	em_install_stella
-	em_install_mednafen
-	em_install_ppsspp
-	em_install_dolphin
-	em_install_pcsx2
-	em_install_gens
-
-	#fix permissions since we are running as sudo
-	h_correct_perms
-
-	# Run Debug checks
-	rrs_debug
-
-	__postMSGs="$__postMSGs This current configuration requires BIOS files be placed under '$rootdir/BIOS/' folder for the respective system you are using or under the '$rootdir/ROMs/' folder for the same system. You may also use the BIOS Loader under the settings menu. Many MAME games under MAME4ALL have self contained BIOS files."
-
-	# inject a space to seperate messages?
-	__postMSGs="$__postMSGs "
-
-	__postMSGs="$__postMSGs\n\nIf you wish to have artwork for the MAME games, please visit the RCB main page at http://bit.ly/1lHHSIe and follow the 'Get artwork from emumovies' section'. The size is much too large to contain in RetroRig or Github. This may change."
-
-
-	if [[ ! -z $__postMSGs ]]; then
-	dialog --backtitle "LibreGeek.org - RetroRig Setup. Installation folder: $rootdir for user $user" --msgbox "$__postMSGs" 17 70
-	fi
-
-	dialog --backtitle "LibreGeek.org - RetroRig Setup. Installation folder: $rootdir for user $user" --msgbox "Finished emulator installs.\n\nYou now have to copy roms to the roms folders. You may also use the 'ROM loader' in settings menu" 17 60
-
-}
-
-function rrs_software() 
-{
-
-	# clear post install messages
-	__postMSGs=""
-	clear
-
-	echo "Binaries-based installation"
-
-	# add multi-arch support
-	$cmd_add_32bit_arch
-
-	# add add repos and 
-	rrs_add_standard_repos
-
-	# add extra repostories to the em_add_repos function!
-	em_add_repos
-
-	# update system pkgs currently installed first
-	h_upgrade_system
-
-	# install software from repositories
-	# install binaries
-	$cmd_install_pkg xboxdrv curl python-software-properties \
-	pkg-config software-properties-common dconf-tools jstest-gtk \
-	qjoypad sixad libusb-0.1-4 antimicro bluez getpos unclutter \
-	joydetect sudo
-
-	#wii motion support
-	$cmd_install_pkg libcwiid1 lswm wmgui wminput
-
-	# call RetroRig's custom deb install for ps3 hotplugging. 
-	# Thankfully our package still works with the Xbox 360 implementation,
-	# so it is now part of the standard install set
-	rrs_xbmc_patched
-
-	# Disable apport, as bug apport-gtk does nothing but interrupt
-	# User can always enable this again
-	# XBMC and emulators
-	sed -i "s|enabled=1|enabled=0|g" "/etc/default/apport"
-
-	#fix permissions since we are running as sudo
-	h_correct_perms
-
-	# Run Debug checks
-	rrs_debug
-
-	# Inform user about post-install tasks
-	# Output postMSGs to screen
-
-	# inject a space to seperate messages?
-	__postMSGs="$__postMSGs For VirtualBox users, please see the wiki under 'Installation' for notes on running RetroRig under a virtual machine! At the minimum, you will need to add a filter for your controller "
-
-	if [[ ! -z $__postMSGs ]]; then
-		dialog --backtitle "LibreGeek.org - RetroRig Setup. Installation folder: $rootdir for user $user" --msgbox "$__postMSGs\n\nSoftware install complete. See debug.log for more details. Continuing on to emulator installs..." 18 60
-	fi
-
-	chown -R "$user" "$rootdir/logs/install_$now.log.txt"
-	chgrp -R "$user" "$rootdir/logs/install_$now.log.txt"
-
-}
-
-function rrs_debug()
-{
-	clear
-	echo "Generating debug log"
-
-	# Check for existance of essential files
-	echo "Essential files: XBMC:" > "$rootdir/logs/debug.log"
-	echo "Path(s): '$xbmc_home/userdata'" >> "$rootdir/logs/debug.log"
-	h_filechecker "$xbmc_home/userdata" "$rootdir/logs/debug.log"
-
-	# RCB
-	echo "Essential files: ROM Collection Browser:" >> "$rootdir/logs/debug.log"
-	echo "Path: '$xbmc_home/addons/script.games.rom.collection.browser'" >> "$rootdir/logs/debug.log"
-	h_filechecker "$xbmc_home/addons/script.games.rom.collection.browser"	
-	echo "Path: '$xbmc_home/userdata/addon_data/script.games.rom.collection.browser'" >> "$rootdir/logs/debug.log"
-	h_filechecker "$xbmc_home/userdata/addon_data/script.games.rom.collection.browser" "$rootdir/logs/debug.log"
-
-	# applications
-	h_filechecker "/usr/lib/xbmc/xbmc.bin"
-	h_filechecker "/usr/bin/xbmc-retrorig"
-	h_filechecker "/usr/share/applications/RetroRig.desktop"
-	h_filechecker "/usr/share/applications/startXBMC.sh"
-	h_filechecker "/usr/share/applications/gp_autodetect_xbmc.sh"
-	h_filechecker "$xdg_desktop_dir/RetroRig.desktop"
-	h_filechecker "$xdg_pictures_dir/retro-icon.png"
-
-	# autostart entries
-	h_filechecker "$home/.config/autostart/RetroRig.desktop"
-	#h_filechecker "$home/.config/autostart/qjoypad.desktop"
-
-	# init file checks	
-	echo "Available init files:" >> "$rootdir/logs/debug.log"
-	echo "Has xboxdrv been loaded?" >> "$rootdir/logs/debug.log"
-	h_filechecker "/etc/init.d/xboxdrv"
-	h_filechecker "/etc/default/xboxdrv"
-
-	# Check unity settings:
-	echo "Unity settings (if applicable):" >> "$rootdir/logs/debug.log"
-	gsettings list-recursively "org.gnome.desktop.screensaver" | grep "lock-enabled" >> "$rootdir/logs/debug.log"
-	gsettings list-recursively "org.gnome.desktop.screensaver" | grep "ubuntu-lock-on-suspend" >> "$rootdir/logs/debug.log"	
-	gsettings list-recursively "org.gnome.desktop.session" | grep "idle-delay" >> "$rootdir/logs/debug.log"
-
-	# Source built / pre-built
-	h_filechecker "$rootdir/emulators/PPSSPP/ppsspp-0.9.8-SDL-pk64"
-	h_filechecker "/ust/bin/PPSSPPSDL"
-
-	# pkg checks
-	echo -e "\nCheck for needed pkgs installed via apt: " >> "$rootdir/logs/debug.log"
-	h_pkgcheck "stella"
-	h_pkgcheck "python-software-properties"
-	h_pkgcheck "xbmc"
-	h_pkgcheck "dconf-tools"
-	h_pkgcheck "xboxdrv"
-	h_pkgcheck "curl"
-	h_pkgcheck "xbmc"
-	h_pkgcheck "mednafen"
-	h_pkgcheck "mess"
-	h_pkgcheck "mame"
-	h_pkgcheck "qjoypad"
-	h_pkgcheck "jstest-gtk"
-
-   	echo -e "\nEnd of log file" >> "$rootdir/logs/debug.log" >> "$rootdir/logs/debug.log"
-
-	dialog --backtitle "LibreGeek.org - RetroRig Setup. Installation folder: $rootdir for user $	user" --msgbox "Debug log was generated in $rootdir/logs/debug.log. Additional logs can be found in the folder $rootdir/logs/." 10 60 
-
-	#corect permissions
-	h_correct_perms
-}
-
-function rrs_xbmc_patched()
-{
-
-	clear
-	# release the aptitdue hold to install/upgrade RetroRig's XBMC version
-	$cmd_unhold_pkg xbmc xbmc-bin
-
-	# create autostart for XBMC and place our modified files
-	# Custom script for reboots/hotplugging
-	if [ -f "$scriptdir/XBMC-cfgs/extra/gp_autodetect_xbmc.sh" ]; then
-		cp -v "$scriptdir/XBMC-cfgs/extra/gp_autodetect_xbmc.sh" "/usr/share/applications/"
-	fi
-
-	if [ -f "$scriptdir/XBMC-cfgs/extra/RetroRig.desktop" ]; then
-		cp -v "$scriptdir/XBMC-cfgs/extra/RetroRig.desktop" "/usr/share/applications/"
-	fi
-
-	if [ -f "$scriptdir/XBMC-cfgs/extra/RetroRig.desktop" ]; then
-		cp -v "$scriptdir/XBMC-cfgs/extra/RetroRig.desktop" "$xdg_desktop_dir"
-	fi
-
-	if [ -f "$scriptdir/XBMC-cfgs/extra/retro-icon.png" ]; then
-		cp -v "$scriptdir/XBMC-cfgs/extra/retro-icon.png" "/usr/share/icons/"
-	fi
-
-	if [ -f "$scriptdir/XBMC-cfgs/extra/startXBMC.sh" ]; then
-		cp -v "$scriptdir/XBMC-cfgs/extra/startXBMC.sh" "/usr/share/applications/"
-	fi
-
-	# insert restarting xboxdrv specifically into /etc/sudoers
-	cat "$scriptdir/XBMC-cfgs/extra/sudoers.txt" >> "/etc/sudoers"
-
-	# create autostart entry, remove prior if it exists
-	rm -f "$home.config/autostart/RetroRig.desktop"
-	cp -v "$scriptdir/XBMC-cfgs/extra/RetroRig.desktop" "$home/.config/autostart"
-
-	# fix their permissions
-	chmod 755 "/usr/share/applications/gp_autodetect_xbmc.sh" 
-	chmod 755 "$home/.config/autostart/RetroRig.desktop"
-	chmod 755 "/usr/share/applications/RetroRig.desktop"
-	chmod 755 "/usr/share/applications/startXBMC.sh" 
-
-	# remove old xbmc-bin, install our patched version
-	$cmd_remove_pkg xbmc xbmc-bin
-
-	# remove old /tmp files if they exist
-	rm -f "/tmp/xbmc_gotham-patched-for-retrorig-patchlevel-*-0trusty.deb"
-	rm -f "/tmp/xbmc-bin_gotham-patched-for-retrorig-patchlevel-*-0trusty.deb"
-
-	#xbmc works fine w/o these librarys, but generates error messages in its log file
-	$cmd_install_pkg libcec2 libcrystalhd3
-
-	# release aptitude hold for upgrade/install
-	$cmd_unhold_pkg xbmc
-
-	echo "Installing xbmc"
-	$cmd_install_pkg xbmc
-
-	# hold package after install against upgrades
-	$cmd_hold_pkg xbmc
-
-	# get SHA1 tag from patched XBMC version
-	sha1=$(file /usr/lib/xbmc/xbmc.bin | cut -f 19 -d ' '| cut -f 2 -d '='|cut -f 1 -d ',')
-
-	# insert SHA1 tag to rescan by replacing the placeholder
-	if [ -f "$scriptdir/XBMC-cfgs/extra/rescan" ]; then
-		cp -v "$scriptdir/XBMC-cfgs/extra/rescan" "/etc/init.d/rescan"
-	fi
-
-	sed -i "s/placeholderSHA1/$sha1/" "/etc/init.d/rescan"
-
-	# Create our on start file so we have use our own dotfile, rather than make the user
-	# use their existing .xbmc dotfile
-	if [ -f "$scriptdir/XBMC-cfgs/extra/xbmc-retrorig" ]; then
-		cp -v "$scriptdir/XBMC-cfgs/extra/xbmc-retrorig" "/usr/bin"
-	fi
-
-	chmod 755 "/etc/init.d/rescan"  
-
-	# Link the startXBMC.sh startup script to /usr/bin, so users can call "retrorig" at will
-	ln -sf "/usr/share/applications/startXBMC.sh" "/usr/bin/retrorig"
-
-	# update init scripts
-	$update_init_rescan
-
-	# start service
-	$cmd_rescan_start
-
-	# Tell aptitude to hold our packages to avoid unwanted upgrades
-	# Please refer to the top of this script, where the hold is released for upgrade purposes
-	$cmd_hold_pkg xbmc xbmc-bin 
-
-	echo "*****"
-	echo "*****"
-	echo "***** please fix me! Background for xbmc *****"
-	echo "*****"
-	echo "*****"
-	# somewhere must be a command to set these files
-	# in guisetting.xml
-	# The settings should point directly to 
-	# $scriptdir/Artwork/XBMC/XBMC-logo-Ace-Skin.png and gears.png
-	ln -sf $scriptdir/Artwork/XBMC/* "$rootdir/Artwork/XBMC/"
-	chown $user $rootdir/Artwork/XBMC/*
-	chgrp $user $rootdir/Artwork/XBMC/*
-
-	#corect permissions
-	h_correct_perms
-
-}
-
-function rrs_retrorig_cfgs()
-{
-	cp -Rv "$scriptdir/retrorig-cfgs/retrorig.cfg" "$configFile"
-
-	ln -sf "$scriptdir/scripts" "$config_home/scripts"
-	chown "$user" "$config_home/scripts"
-	chgrp "$user" "$config_home/scripts"
-}
-
-function rrs_xbmc_cfgs()
-{
-	clear
-
-	# set local vars for this function
-	local gamedb_org="$xbmc_home/userdata/addon_data/script.games.rom.collection.browser/MyGames.db"
-	local gamedb_tmp="/tmp/MyGames.db"
-
-	# back the current MyGames.db file if it exists	
-	if [[ -d "$gamedb_org" ]]; then
-		cp -v "$gamedb_org" "/tmp"
-	fi
-
-	# xbmc does not (at least for Ubuntu's repo pkg) load the
-	# dot files without loading XBMC at least once, so let's copy ours in first
-
-	# Copy in default folder base from first run:	
-	cp -Rv "$scriptdir/XBMC-cfgs/addons" "$xbmc_home"
-	cp -Rv "$scriptdir/XBMC-cfgs/userdata" "$xbmc_home"
-
-	# Restore MyGames.db if it exists
-	if [[ -d "$gamedb_tmp" ]]; then
-		# copy file over
-		cp -v "$gamedb_tmp" "$xbmc_home/userdata/addon_data/script.games.rom.collection.browser/"
-		# remove /tmp file
-		# rm -f "$gamedb_tmp"
-	fi
-
-	# set the system user to an absolute value.
-	# RCB and some config files don't like using $config_home, rather /home/test/
-	# Let's change the config files to reflect the current username
-	sed -i "s|/home/test/|/home/$user/|g" "$xbmc_home/userdata/addon_data/script.games.rom.collection.browser/config.xml"
-
-	# Change hardcoded paths in "$xbmc_home/userdata/guisettings.xml" (Ace XBMC skin adds these)
-	#
-	# Side note: For the Ace XBMC theme, backgrounds are loaded into "$xbmc_home/userdata/Database/Textures13.db"
-	# Therefore, it is VERY important to do a fresh install of the Ace theme, and configure from scatch to avoid
-	# corruption, segfaults, or other oddities.
-	sed -i "s|installdir_temp|$rootdir|g" "$xbmc_home/userdata/guisettings.xml"
-
-	# XBMC custom settings launchers (Advanced Launcher)
-	sed -i "s|config_temp|$config_home|g" "$xbmc_home/userdata/addon_data/plugin.program.advanced.launcher/launchers.xml"
-
-	# echo user change
-	echo "The user applied to configuration files was: $user"
-
-	# correct permissions
-	h_correct_perms
-}
-
-function rrs_done()
-{
-
-	# The 3.14 manual kernel upgrade for Ubuntu systems is no longer necessary
-	# This is confirmed to be fixed since linux: 3.13.0-38.65
-	# Confirmed to be fine in current 3.13.0-37-generic.
-	# Please see commit efeb2bd for legacy code. This message will be 
-	# Removed in due time.
-
-       	dialog --backtitle "LibreGeek.org - RetroRig Setup. Installation folder: $rootdir for user $user" --msgbox "Finished main install tasks.\n\nYou now have to copy roms to the roms folders. \nThis can be done via SSH, Samba, or via your graphic folder manager (please see settings menu for more)\n\nAll current config folders used were appended with .old for restoration purposes.\n\n" 18 50
-
-	# correct permissions
-	h_correct_perms
-}
-
-function rrs_showHelp()
-{
-    #set color for highlights
-    # Arch Linux wiki color listing: http://bit.ly/1nhkU8Y
-    PATHCOLOR="36m"  #Cyan text
-    TITLECOLOR="33m"  #Yellow text
-    BARCOLOR="35m"  #Yellow text
-
-    #Console help file
-    clear
-    echo ""
-    echo -e "\e[0"$BARCOLOR$"============================================================\e[0m"
-    echo -e "\e[0"$TITLECOLOR$"RetroRig Help File\e[0m"
-    echo -e "\e[0"$BARCOLOR$"============================================================\e[0m"
-    echo ""
-    echo "This script installs XBMC as a backend, many emulators, 
-and ROM Collection Browser as the graphical front end. 
-Because it needs to install some APT packages it has to be 
-run with root priviliges."
-
-    echo ""
-    echo "When using..."
-    echo "sudo ./retrorig_setup.sh
-The installation directory is:"
-echo -e "\e[0$PATHCOLOR$xbmc_home/RetroRig for the current user\e[0m"
-
-    echo ""
-    echo "When using..."
-    echo "sudo ./retrorig_setup.sh USERNAME
-The installation directory is:"
-echo -e "\e[0$PATHCOLOR/$xbmc_home/USERNAME/RetroRig for user USERNAME\e[0m"
-
-    echo ""
-    echo "When using..."
-    echo "sudo ./retrorig_setup.sh USERNAME ABSPATH
-The installation directory is:"
-echo -e "\e[0"$PATHCOLOR"ABSPATH for user USERNAME\e[0m"
-    echo ""
-    echo "Please submit all issues to GitHub: bit.ly/1ocT0we"
-    
-    echo -e "\e[0"$BARCOLOR$"============================================================\e[0m"
-    echo "End Help File"
-    echo -e "\e[0"$BARCOLOR$"============================================================\e[0m"
-    echo ""
-}
-
-function rrs_prereq()
-{
-	if [[ -z $(type -P git) || -z $(type -P dialog) || -z $(type -P figlet) ]]; then
-		echo ""
-		echo "######################################"
-		echo "Pre-req checks"	
-		echo "######################################"
-		echo "Did not find 1 or more of the packages: git, dialog, or figlet"
-		echo "Attempting to install these now."
-		echo ""
-		sleep 3s
-		# Update system first
-		$cmd_update_system
-		# fetch needed pkgs
-		$cmd_install_pkg git dialog figlet
-		if [ $? == '0' ]; then
-			echo "Successfully installed 'git/dialog/figlet'." > "$rootdir/logs/prechecks.log"
-			sleep 3s
-			prereqs="true"
-		else
-			echo "Could not install 'git' and/or 'dialog/figlet'. Exiting..." > "$rootdir/logs/prechecks.log"
-			prereqs="false"
-			sleep 3s
-			exit 1
-		fi
-	else
-		echo "Found packages 'git/dialog/figlet'." > "$rootdir/logs/prechecks.log"
-		prereqs="true"
-		sleep 2s
-	fi
-
-
-echo "Current install user: $SUDO_USER" >> "$rootdir/logs/prechecks.log"
-echo "Current install rootdir is: $rootdir" >>"$rootdir/logs/prechecks.log"
-echo "Current script dir is:  $rootdir" >>"$rootdir/logs/prechecks.log"
-
-if [ "$prereqs" == "true" ]; then
-	echo "Pre-checks were sucessful!!!" >> "$rootdir/logs/prechecks.log"
-else
-	echo "Pre-checks were NOT sucessful. Sad crab!" >> "$rootdir/logs/prechecks.log"
-fi
-
-chown -R "$user" "$rootdir/logs/prechecks.log"
-chgrp -R "$user" "$rootdir/logs/prechecks.log"
-
-}
-
-function rrs_reboot()
-{
-
-	#confirm reboot is the intended action
-	dialog --title "Confirm yes/no" \
-	--backtitle "LibreGeek.org RetroRig Installer" \
-	--yesno "Are you sure you want to reboot?"  6 0
-
-	# Get exit status
-	# 0 means user hit [yes] button.
-	# 1 means user hit [no] button.
-	# 255 means user hit [Esc] key.
-	response=$?
-	case $response in
-		0)
-		clear
-		$cmd_reboot
-		;;
-
-		1)
-		return 
-		;;
-
-		255)
-		return
-		;;
-	esac
-}
-
-<<<<<<< HEAD
-=======
-rrs_kernel_check()
-{
-
-	# The 3.14 manual kernel upgrade for Ubuntu systems is no longer necessary
-	# This is confirmed to be fixed since linux: 3.13.0-38.65
-	# Confirmed to be fine in current 3.13.0-37-generic.
-	# Please see commit efeb2bd for legacy code. This message will be 
-	# Removed in due time. 
-
-	# System is upgraded during initial install
-	# Something needs to be here or otherwise there is a syntax error?
-	echo "" > /dev/null
-
-}
->>>>>>> master
diff --git a/supplemental/PS3_sixaxis.xcf b/supplemental/PS3_sixaxis.xcf
new file mode 100644
index 0000000..fbb2c98
Binary files /dev/null and b/supplemental/PS3_sixaxis.xcf differ
diff --git a/supplemental/build-retrorig-setup-ppa.sh b/supplemental/build-retrorig-setup-ppa.sh
index 2d9cc70..9b4a2f2 100755
--- a/supplemental/build-retrorig-setup-ppa.sh
+++ b/supplemental/build-retrorig-setup-ppa.sh
@@ -3,13 +3,13 @@
 #======================================================================== 
 #
 # Author      : Michael T. DeGuzis, Jens-Christian Lache
-# Date        : 201401115
+# Date        : 201401121
 # Version     : 0.9.7
 # Description : Install RetroRig via Debian package
 #
 #		Please see changelog for latest alterations and fixes
 #
-# ========================================================================
+#========================================================================
 
 clear
 
@@ -21,7 +21,7 @@ BASE=0.9.7
 # In this case, this level will be used to denote incremental changes
 # instead of a specific branch for now (beta/master only exist at the
 # momement).
-PL=1.2
+PL=3.2
 
 #choose user
 #user="pk"
@@ -75,10 +75,10 @@ if [ "$user" == "jc" ]; then
 	LAUNCHPAD_PPA="ppa:beauman/retrorig-testing"
 
 	#changed in package
-	CHANGE_TEXT=" New dolphin version / splitted configuration folder for Wii and Gamecube"
+	CHANGE_TEXT="merged quality of life changes from Two-Tone"
 
 	#define uploader, date and time zone for changelog
-	uploader_date="Jens-Christian Lache <jc.lache@web.de>  Sat, 15 Nov 2014 16:00:00 +0100"
+	uploader_date="Jens-Christian Lache <jc.lache@web.de>  Sat, 23 Nov 2014 18:30:00 +0100"
 
 	#define package maintainer for dsc and control file 
 	pkgmaintainer="RetroRig Development Team <jc.lache@gmail.com>"
@@ -106,6 +106,8 @@ echo "changed: "$CHANGE_TEXT
 echo ""
 echo "uploading to: "$LAUNCHPAD_PPA
 echo ""
+echo "by/date: "$uploader_date
+echo ""
 echo "Did you adapt debian/changelog accordingly?"
 echo ""
 echo ""
@@ -181,7 +183,9 @@ sed -i "s|pkgmaintainer|$pkgmaintainer|g" "retrorig-setup-$PRE:$BASE.$PL.dsc"
 SRC_FOLDER=retrorig-setup-$BASE.$PL
 
 echo "cloning repository"
+
 git clone $source_reprository  
+
 file RetroRig/
 
 if [ $? -eq 0 ]; then  
@@ -220,8 +224,18 @@ cp ~/RetroRig/supplemental/retrorig-setup/format debian/source/
 echo "Makefile"
 cp ~/RetroRig/supplemental/retrorig-setup/Makefile .
 
+echo "copyright"
+cp ~/RetroRig/supplemental/retrorig-setup/copyright debian/copyright
+
+echo "compat"
+cp ~/RetroRig/supplemental/retrorig-setup/compat debian/compat
+
+echo "postinst/postrm"
+cp ~/RetroRig/supplemental/retrorig-setup/postinst debian/postinst
+cp ~/RetroRig/supplemental/retrorig-setup/postrm debian/postrm
+
 echo "removing internal files"
-rm -rf supplemental/ .git/
+rm -rf .git/
 
 echo "installation script"
 if [ -f retrorig-setup.sh ]; then  
diff --git a/supplemental/retrorig-setup/changelog b/supplemental/retrorig-setup/changelog
index 3fa1265..413e03f 100644
--- a/supplemental/retrorig-setup/changelog
+++ b/supplemental/retrorig-setup/changelog
@@ -3,10 +3,22 @@ retrorig-setup (version_placeholder) trusty; urgency=medium
   * changelog_text
 
  -- uploader_date
+
+retrorig-setup (0:0.9.7.3.1) trusty; urgency=medium
+
+  * bug fix h_pkgcheck() / PS3 Sixaxis USB hotplug support
+
+ -- Jens-Christian Lache <jc.lache@web.de>  Sat, 22 Nov 2014 14:30:00 +0100
+ 
+retrorig-setup (0:0.9.7.2) trusty; urgency=medium
+
+  * Lintian messages reduced
+
+ -- Jens-Christian Lache <jc.lache@web.de>  Wed, 19 Nov 2014 20:30:00 +0100
  
 retrorig-setup (0:0.9.7.1.2) trusty; urgency=medium
 
-  *  New dolphin version / splitted configuration folder for Wii and Gamecube
+  *  New dolphin version / split configuration folder for Wii and Gamecube
 
  -- Jens-Christian Lache <jc.lache@web.de>  Sat, 15 Nov 2014 16:00:00 +0100
  
diff --git a/supplemental/retrorig-setup/compat b/supplemental/retrorig-setup/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/supplemental/retrorig-setup/compat
@@ -0,0 +1 @@
+9
diff --git a/supplemental/retrorig-setup/control b/supplemental/retrorig-setup/control
index e5b1193..5f785dd 100644
--- a/supplemental/retrorig-setup/control
+++ b/supplemental/retrorig-setup/control
@@ -1,5 +1,5 @@
 Source: retrorig-setup
-Section: games
+Section: video
 Priority: extra
 Maintainer: pkgmaintainer
 Build-Depends: debhelper (>= 9)
@@ -8,7 +8,7 @@ Homepage: https://github.com/ProfessorKaos64/RetroRig
 
 Package: retrorig-setup
 Architecture: any
-Depends: 
+Depends: ${misc:Depends}
 Description: RetroRig is a suite of console emulators embedded in a 
  home theater program. 
  .    
diff --git a/supplemental/retrorig-setup/copyright b/supplemental/retrorig-setup/copyright
new file mode 100644
index 0000000..9865616
--- /dev/null
+++ b/supplemental/retrorig-setup/copyright
@@ -0,0 +1,86 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: retrorig
+Source: https://github.com/ProfessorKaos64/RetroRig
+
+Files: *
+Copyright: 2014 LibreGeek.org / 2014 JC Techno Labs
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+ 
+Files: usr/share/RetroRig/XBMC-cfgs/addons/plugin.program.advanced.launcher-master/*
+Copyright: plugin.program.advanced.launcher-master
+License: GPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ 
+Files: usr/share/RetroRig/XBMC-cfgs/addons/script.games.rom.collection.browser/*
+Copyright: script.games.rom.collection.browser
+License: GPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: usr/share/RetroRig/XBMC-cfgs/addons/service.rom.collection.browser/*
+Copyright: service.rom.collection.browser
+License: GPL-2
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+Files: usr/share/RetroRig/XBMC-cfgs/addons/skin.ace/*
+Copyright: XBMC Skin Ace
+License: Creative Commons Attribution-ShareAlike 3.0 license
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the Creative Commons Attribution-ShareAlike 3.0 
+ license as published on https://creativecommons.org/licenses/by-sa/3.0/.
diff --git a/supplemental/retrorig-setup/postinst b/supplemental/retrorig-setup/postinst
new file mode 100644
index 0000000..38e5757
--- /dev/null
+++ b/supplemental/retrorig-setup/postinst
@@ -0,0 +1,50 @@
+#!/bin/sh
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+# source debconf library
+. /usr/share/debconf/confmodule
+
+# Source dbconfig-common functions
+if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql  ]; then
+  . /usr/share/dbconfig-common/dpkg/postinst.pgsql
+fi
+
+case "$1" in
+
+  configure)
+    # setup service rescan
+    update-rc.d rescan defaults
+  ;;
+
+  abort-upgrade|abort-remove|abort-deconfigure)
+    exit 0
+  ;;
+
+  *)
+    echo "postinst called with unknown argument \`$1'" >&2
+    exit 1
+  ;;
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+db_stop
+
+exit 0
diff --git a/supplemental/retrorig-setup/postrm b/supplemental/retrorig-setup/postrm
new file mode 100644
index 0000000..7177cda
--- /dev/null
+++ b/supplemental/retrorig-setup/postrm
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <r>overwrit>r> <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+. /usr/share/debconf/confmodule
+
+# Source dbconfig-common functions
+if [ -f /usr/share/dbconfig-common/dpkg/postrm.pgsql  ]; then
+  . /usr/share/dbconfig-common/dpkg/postrm.pgsql
+fi
+
+case "$1" in
+  purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    update-rc.d rescan defaults
+  ;;
+
+  *)
+    echo "postrm called with unknown argument \`$1'" >&2
+    exit 1
+  ;;
+
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/supplemental/retrorig-setup/retrorig-setup.7 b/supplemental/retrorig-setup/retrorig-setup.7
index a4b12f2..78e6e72 100644
--- a/supplemental/retrorig-setup/retrorig-setup.7
+++ b/supplemental/retrorig-setup/retrorig-setup.7
@@ -1,27 +1,66 @@
-NAME
-    retrorig-setup - a convenient debian package to install all necessary files to
-    install retrorig.
+.\" Man page generated from reStructuredText.
+.
+.TH   "" "" ""
+.SH NAME
+retrorig-setup \- installation routine for RetroRig
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.INDENT 0.0
+.TP
+.B NAME
+retrorig-setup \- installation routine for RetroRig
+.TP
+.B SYNOPSIS
+sudo retrorig-setup
+su -c retrorig-setup
+.TP
+.B DESCRIPTION
+This setup package will install all necessary setup files for users to configure
+and install RetroRig itself.
+.TP
+.B OPTIONS
+None
+.TP
+.B NOTES
+Please submit an issue ticket to
+\fI\%https://github.com/ProfessorKaos64/RetroRig\fP if you wish to 
+make a Pull Request or report any other issue.
+.TP
+.B SEE ALSO
+Visit https://github.com/ProfessorKaos64/RetroRig for more information
+.TP
+.B COPYRIGHT
+2014 RetroRig Project
+.TP
+.B AUTHOR
+Michael DeGuzis <mdeguzis@gmail.com>
+Jens-Christian Lache <\fI\%jc.lache@gmail.com\fP>
+.UNINDENT
+.\" Generated by docutils manpage writer.
+.
 
-SYNOPSIS
-    sudo retrorig-setup
-    su -c retrorig-setup
-
-DESCRIPTION
-    This setup package will install all necessary setup files for users to configure
-    and install retrorig itself.
-
-OPTIONS
-    TO-DO
-    
-SEE ALSO
-    Visit https://github.com/ProfessorKaos64/RetroRig for more information
-
-BUGS
-    For the latest issues, please see the github repository. Show-stopping issues
-    will be reported here.
-
-AUTHOR
-   Michael DeGuzis <mdeguzis@gmail.com>
-
-COPYRIGHT
-   2014 RetroRig Project
diff --git a/supplemental/retrorig-setup/retrorig-setup.dsc b/supplemental/retrorig-setup/retrorig-setup.dsc
index dcb5ed8..f4f33bd 100644
--- a/supplemental/retrorig-setup/retrorig-setup.dsc
+++ b/supplemental/retrorig-setup/retrorig-setup.dsc
@@ -8,4 +8,4 @@ Homepage: https://github.com/ProfessorKaos64/RetroRig
 Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9)
 Package-List: 
- retrorig-setup deb games extra
+ retrorig-setup deb video extra
diff --git a/supplemental/retrorig-setup/rules b/supplemental/retrorig-setup/rules
index 8f254d5..bc58068 100755
--- a/supplemental/retrorig-setup/rules
+++ b/supplemental/retrorig-setup/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-# Copyright (C) 2014 Jens-Christian Lache
+# Copyright (C) 2014 JC Techno Labs
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,38 +34,83 @@ override_dh_install:
 	# Add here commands to install the package 
 	
 	#create system directories
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/RetroRig 
-	mkdir -p $(CURDIR)/debian/tmp/usr/bin 
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/applications
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/icons 
-	mkdir -p $(CURDIR)/debian/tmp/etc/init.d
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib/RetroRig/Artwork/XBMC
+	mkdir -p $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig 
+	mkdir -p $(CURDIR)/debian/retrorig-setup/usr/bin 
+	mkdir -p $(CURDIR)/debian/retrorig-setup/usr/share/applications
+	mkdir -p $(CURDIR)/debian/retrorig-setup/usr/share/icons 
+	mkdir -p $(CURDIR)/debian/retrorig-setup/etc/init.d
+	mkdir -p $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/Artwork/XBMC
+	mkdir -p $(CURDIR)/debian/retrorig-setup/usr/share/man/man7
+	mkdir -p $(CURDIR)/debian/retrorig-setup/usr/share/doc/RetroRig/
+	mkdir -p $(CURDIR)/debian/retrorig-setup/usr/lib
 	
 	# copy base files
-	cp -r scripts/ gamepad-cfgs/ emu-cfgs/ init-scripts/ scriptmodules/  XBMC-cfgs/ retrorig-cfgs/ common/ $(CURDIR)/debian/tmp/usr/lib/RetroRig
+	cp -r scripts/ gamepad-cfgs/ emu-cfgs/ init-scripts/ scriptmodules/  XBMC-cfgs/ retrorig-cfgs/ common/ $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig
 	
 	#copy executables
-	cp retrorig-setup $(CURDIR)/debian/tmp/usr/bin/ 
-	mv $(CURDIR)/debian/tmp/usr/lib/RetroRig/XBMC-cfgs/extra/xbmc-retrorig $(CURDIR)/debian/tmp/usr/bin 
+	cp retrorig-setup $(CURDIR)/debian/retrorig-setup/usr/bin/ 
+	mv $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/extra/xbmc-retrorig $(CURDIR)/debian/retrorig-setup/usr/bin 
 	
 	#icons / pictures
-	mv $(CURDIR)/debian/tmp/usr/lib/RetroRig/XBMC-cfgs/extra/retro-icon.png $(CURDIR)/debian/tmp/usr/share/icons
-	cp Artwork/XBMC/RetroMain-0-9-7b.png $(CURDIR)/debian/tmp/usr/lib/RetroRig/Artwork/XBMC/
-	cp Artwork/XBMC/gears.png $(CURDIR)/debian/tmp/usr/lib/RetroRig/Artwork/XBMC/
+	mv $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/extra/retro-icon.png $(CURDIR)/debian/retrorig-setup/usr/share/icons
+	cp Artwork/XBMC/RetroMain-0-9-7b.png $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/Artwork/XBMC/
+	cp Artwork/XBMC/gears.png $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/Artwork/XBMC/
 	
 	#supplemental application files
-	mv $(CURDIR)/debian/tmp/usr/lib/RetroRig/XBMC-cfgs/extra/startXBMC.sh $(CURDIR)/debian/tmp/usr/share/applications
-	cp $(CURDIR)/debian/tmp/usr/lib/RetroRig/XBMC-cfgs/extra/RetroRig.desktop $(CURDIR)/debian/tmp/usr/share/applications
-	mv $(CURDIR)/debian/tmp/usr/lib/RetroRig/XBMC-cfgs/extra/gp_autodetect_xbmc.sh $(CURDIR)/debian/tmp/usr/share/applications
+	mv $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/extra/startXBMC.sh $(CURDIR)/debian/retrorig-setup/usr/share/applications
+	cp $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/extra/RetroRig.desktop $(CURDIR)/debian/retrorig-setup/usr/share/applications
+	mv $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/extra/gp_autodetect_xbmc.sh $(CURDIR)/debian/retrorig-setup/usr/share/applications
 	
 	#services
-	mv $(CURDIR)/debian/tmp/usr/lib/RetroRig/XBMC-cfgs/extra/rescan $(CURDIR)/debian/tmp/etc/init.d/
+	mv $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/extra/rescan $(CURDIR)/debian/retrorig-setup/etc/init.d/
+	
+	#delete redundant files
+	rm -f $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/extra/gp_autodetect_xbmc.sh.testing
+	rm -rf $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/addons/plugin.program.advanced.launcher-master/.gitignore
+	rm -f $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/addons/plugin.program.advanced.launcher-master/LICENSE.txt
+	rm -f $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/addons/script.games.rom.collection.browser/LICENSE.txt
+	rm -f $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/addons/service.rom.collection.browser/LICENSE.txt
+	rm -f $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/addons/skin.ace/LICENSE.txt
+	rm -f $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/addons/script.games.rom.collection.browser/resources/skins/fonts/DejaVuSans-Bold.ttf
+	rm -f $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/addons/script.games.rom.collection.browser/resources/skins/fonts/DejaVuSans.ttf
+	rm -f $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/addons/script.games.rom.collection.browser/resources/skins/fonts/LiberationSans-Regular.ttf
+	
+	#man page
+	gzip -c supplemental/retrorig-setup/retrorig-setup.7 > $(CURDIR)/debian/retrorig-setup/usr/share/man/man7/retrorig-setup.7.gz
+	gzip -c supplemental/retrorig-setup/xbmc-retrorig.7 > $(CURDIR)/debian/retrorig-setup/usr/share/man/man7/xbmc-retrorig.7.gz
+	
+	#copyright
+	cp -r debian/copyright $(CURDIR)/debian/retrorig-setup/usr/share/doc/RetroRig
+	
+	#libraries
+	#delete libs
+	find $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/addons/script.games.rom.collection.browser/resources/platform_libraries/ -name "*.so" -exec rm -f {} \;
+	#mkdir -p $(CURDIR)/debian/retrorig-setup/usr/lib/RetroRig/XBMC-cfgs/addons/script.games.rom.collection.browser/resources/platform_libraries/
+	#mv $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/addons/script.games.rom.collection.browser/resources/platform_libraries/Linux64/ \
+	#$(CURDIR)/debian/retrorig-setup/usr/lib/RetroRig/XBMC-cfgs/addons/script.games.rom.collection.browser/resources/platform_libraries/
+	
+
 
 override_dh_makeshlibs:
-	
+	#set executable attribute
+	chmod 755 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/addons/script.games.rom.collection.browser/resources/scriptfiles/applaunch.sh
+	chmod 755 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/scriptmodules/configuration.shinc
+	chmod 755 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/scriptmodules/emulators.shinc
+	chmod 755 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/scriptmodules/gamepads.shinc
+	chmod 755 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/scriptmodules/helpers.shinc
+	chmod 755 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/scriptmodules/settings.shinc
+	chmod 755 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/scriptmodules/setup.shinc
+	chmod 755 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/scriptmodules/syscalls-deb.shinc
+	chmod 755 $(CURDIR)/debian/retrorig-setup/usr/share/applications/gp_autodetect_xbmc.sh
+	chmod 755 $(CURDIR)/debian/retrorig-setup/usr/share/applications/startXBMC.sh
 
-override_dh_auto_test:
-	
+	#removing unnecessary executable attributes
+	chmod 644 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/common/parserConfig.xml
+	chmod 644 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/extra/RCB_emu_xml/sega_master_system.txt
+	chmod 644 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/gamepad-cfgs/ps3_blu_controller/keyboard.xml
+	chmod 644 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/common/MAME\ synopsis\ RCB\ 201202.zip
+	chmod 644 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/XBMC-session/xbmc.desktop
+	chmod 644 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/XBMC-cfgs/extra/RCB_emu_xml/mame.txt
+	chmod 644 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/init-scripts/ps3_blu_controller/default/xboxdrv
+	chmod 644 $(CURDIR)/debian/retrorig-setup/usr/share/RetroRig/init-scripts/x360_wireless_controller/default/xboxdrv
 
-override_dh_shlibdeps: 
-	
diff --git a/supplemental/retrorig-setup/xbmc-retrorig.7 b/supplemental/retrorig-setup/xbmc-retrorig.7
new file mode 100644
index 0000000..22ddca6
--- /dev/null
+++ b/supplemental/retrorig-setup/xbmc-retrorig.7
@@ -0,0 +1,65 @@
+.\" Man page generated from reStructuredText.
+.
+.TH   "" "" ""
+.SH NAME
+xbmc-retrorig \- XBMC patched for project RetroRig
+.
+.nr rst2man-indent-level 0
+.
+.de1 rstReportMargin
+\\$1 \\n[an-margin]
+level \\n[rst2man-indent-level]
+level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
+-
+\\n[rst2man-indent0]
+\\n[rst2man-indent1]
+\\n[rst2man-indent2]
+..
+.de1 INDENT
+.\" .rstReportMargin pre:
+. RS \\$1
+. nr rst2man-indent\\n[rst2man-indent-level] \\n[an-margin]
+. nr rst2man-indent-level +1
+.\" .rstReportMargin post:
+..
+.de UNINDENT
+. RE
+.\" indent \\n[an-margin]
+.\" old: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.nr rst2man-indent-level -1
+.\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
+.in \\n[rst2man-indent\\n[rst2man-indent-level]]u
+..
+.INDENT 0.0
+.TP
+.B NAME
+xbmc-retrorig \- XBMC patched for project RetroRig
+.TP
+.B SYNOPSIS
+retrorig 
+.TP
+.B DESCRIPTION
+xbmc-retrorig is derived from FernetMenta/XBMC which is used in 
+OpenElec. It was patched with a functions to better support 
+RetroRig, like controller hotplugging, support for native and
+RetroRig mode, the emulator auto-resolution function, among others.
+.TP
+.B FILES
+See https://github.com/beaumanvienna/xbmc/tree/retrorig-pl12
+.TP
+.B OPTIONS
+None
+.TP
+.B NOTES
+Please submit an issue ticket to
+\fI\%https://github.com/ProfessorKaos64/RetroRig\fP if you wish to 
+make a Pull Request or report any other issue.
+.TP
+.B SEE ALSO
+None
+.TP
+.B AUTHOR
+Jens-Christian Lache <\fI\%jc.lache@gmail.com\fP>
+.UNINDENT
+.\" Generated by docutils manpage writer.
+.
diff --git a/test.sh b/test.sh
index 3edc84e..fbf0268 100755
--- a/test.sh
+++ b/test.sh
@@ -1,27 +1,27 @@
 #!/bin/bash
 
 	#create system directories
-	mkdir -p /usr/lib/RetroRig 
-	mkdir -p /usr/lib/RetroRig/Artwork/XBMC
+	mkdir -p /usr/share/RetroRig 
+	mkdir -p /usr/share/RetroRig/Artwork/XBMC
 
 	
 	# copy base files
-	cp -r scripts/ gamepad-cfgs/ emu-cfgs/ init-scripts/ scriptmodules/ common/ XBMC-cfgs/ retrorig-cfgs/ /usr/lib/RetroRig
+	cp -r scripts/ gamepad-cfgs/ emu-cfgs/ init-scripts/ scriptmodules/ common/ XBMC-cfgs/ retrorig-cfgs/ /usr/share/RetroRig
 	
 	#copy executables
 	cp retrorig-setup.sh /usr/bin/retrorig-setup
-	cp /usr/lib/RetroRig/XBMC-cfgs/extra/xbmc-retrorig /usr/bin 
+	cp /usr/share/RetroRig/XBMC-cfgs/extra/xbmc-retrorig /usr/bin 
 	
 	#icons
-	cp /usr/lib/RetroRig/XBMC-cfgs/extra/retro-icon.png /usr/share/icons 
-	cp Artwork/XBMC/XBMC-logo-Ace-Skin.png /usr/lib/RetroRig/Artwork/XBMC/
-	cp Artwork/XBMC/gears.png /usr/lib/RetroRig/Artwork/XBMC/
+	cp /usr/share/RetroRig/XBMC-cfgs/extra/retro-icon.png /usr/share/icons 
+	cp Artwork/XBMC/RetroMain-0-9-7b.png /usr/share/RetroRig/Artwork/XBMC/
+	cp Artwork/XBMC/gears.png /usr/share/RetroRig/Artwork/XBMC/
 	
 	
 	#supplemental application files
-	cp /usr/lib/RetroRig/XBMC-cfgs/extra/startXBMC.sh /usr/share/applications
-	cp /usr/lib/RetroRig/XBMC-cfgs/extra/RetroRig.desktop /usr/share/applications
-	cp /usr/lib/RetroRig/XBMC-cfgs/extra/gp_autodetect_xbmc.sh /usr/share/applications
+	cp /usr/share/RetroRig/XBMC-cfgs/extra/startXBMC.sh /usr/share/applications
+	cp /usr/share/RetroRig/XBMC-cfgs/extra/RetroRig.desktop /usr/share/applications
+	cp /usr/share/RetroRig/XBMC-cfgs/extra/gp_autodetect_xbmc.sh /usr/share/applications
 	
 	#services
-	#mv /usr/lib/RetroRig/XBMC-cfgs/extra/rescan /etc/init.d/
+	#mv /usr/share/RetroRig/XBMC-cfgs/extra/rescan /etc/init.d/