--- burncdda-1.8.2.old/burncdda
+++ burncdda-1.8.2/burncdda
@@ -76,11 +76,14 @@
 declare -i COLS=`tput cols`
 declare -i ROWS=`tput lines`
 
+DIALOG=dialog
+ETCCFG=__META_PREFIX__/etc/burncdda.conf
+
 # read config file function (used in setup, too)
 function readconfig()
 {
-if [ -r /etc/burncdda.conf ]; then
-	source /etc/burncdda.conf
+if [ -r    $ETCCFG ]; then
+	source $ETCCFG
 else
 	echo ""
 	echo "$ERROR"
@@ -108,9 +111,9 @@
 	       --yesno "Wrong burncdda.conf version found. Please use the config file that comes with this burncdda version! Otherwise burncdda will not work correctly. Do you want to restore the default settings of this release?" 8 60
 		if [ $? = "0" ]; then
 			clear
-			echo "cp /usr/lib/burncdda/burncdda.conf.default /etc/burncdda.conf"
+			echo  "cp __META_PREFIX__/data/burncdda.conf.default $ETCCFG"
 			echo "Please enter your root password..."
-			su -c "cp /usr/lib/burncdda/burncdda.conf.default /etc/burncdda.conf"
+			su -c "cp __META_PREFIX__/data/burncdda.conf.default $ETCCFG"
 		if [ $? = "1" ]; then
 			echo -e "\nError: Failed to save '/etc/burncdda.conf'!\n"
 			exit 1
@@ -162,11 +165,11 @@
 DIRFILE=`$MKTEMP /tmp/burncdda.dir.XXXXXX`
 
 # read common functions
-if [ -r "/usr/lib/burncdda/common.func" ]; then
-	source "/usr/lib/burncdda/common.func"
+if [ -r    "__META_PREFIX__/data/common.func" ]; then
+	source "__META_PREFIX__/data/common.func"
 else
 	echo "Fatal error!"
-	echo "File not found: /usr/lib/burncdda/common.func"
+	echo "File not found: __META_PREFIX__/data/common.func"
 	test -e "$TEMPFILE" && rm -f "$TEMPFILE"
 	test -e "$TEXTFILE" && rm -f "$TEXTFILE"
 	test -e "$DIRFILE" && rm -f "$DIRFILE"
@@ -180,8 +183,8 @@
 checkreqtools # common.func
 
 # read other functions
-testsource /usr/lib/burncdda/decodenorm.func
-testsource /usr/lib/burncdda/checkm3u.func
+testsource __META_PREFIX__/data/decodenorm.func
+testsource __META_PREFIX__/data/checkm3u.func
 
 # check the command line options
 commandlineopts "$1" "$2" # common.func
@@ -308,7 +311,7 @@
 				fi
 				if [ -e "$IMGDIR/$WAVNAME" ]; then
 					$DIALOG --backtitle "$BACKTITLE" --title "$ERROR" \
-						--msgbox "Playlist $LNSELECTED of $MAXLNSELECTED:\n'$WAVNAME' already exists. Please delete the existing WAVs!" 7 60
+						--msgbox "Playlist $LNSELECTED of $MAXLNSELECTED:\n$IMGDIR/$WAVNAME already exists. Please delete." 7 60
 					LNSELECTED=$LNSELECTED+1
 					continue
 				fi
@@ -560,7 +563,7 @@
 		;;
 
 		6)
-		testsource /usr/lib/burncdda/setup.func
+		testsource __META_PREFIX__/data/setup.func
 		bc_setup_menu # setup.func
 		;;
 
--- burncdda-1.8.2.old/common.func
+++ burncdda-1.8.2/common.func
@@ -253,7 +253,7 @@
 	# WAVNAME = PLAYLIST without .m3u and without path
 	WAVNAME=`basename "$PLAYLIST" | $SED s/'\.'[Mm]3[Uu]$//`
 	if [ -e "$IMGDIR/$WAVNAME" ]; then
-		echo -e "\n${RED}ERROR:${NOCOLOR} $WAVNAME already exists. Please delete the existing WAVs!"
+		echo -e "\n${RED}ERROR:${NOCOLOR} $WAVNAME already exists. Please delete existing WAVs."
 		exit1 # common.func
 	fi
 
@@ -321,7 +321,7 @@
 	PLAYLIST="$DIRFILE"
 	WAVNAME=`basename "$STARTDIR"`
 	if [ -e "$IMGDIR/$WAVNAME" ]; then
-		echo -e "\n${RED}ERROR${NOCOLOR}: $WAVNAME already exists. Please delete the existing WAVs!"
+		echo -e "\n${RED}ERROR${NOCOLOR}: $WAVNAME already exists. Please delete existing WAVs."
 		exit1 # common.func
 	fi