diff --git a/puppy-unleashed/packages/Axel-2.3-Puppydownload/usr/local/bin/puppydownload b/puppy-unleashed/packages/Axel-2.3-Puppydownload/usr/local/bin/puppydownload
index 0dd5d32..64c9625 100755
--- a/puppy-unleashed/packages/Axel-2.3-Puppydownload/usr/local/bin/puppydownload
+++ b/puppy-unleashed/packages/Axel-2.3-Puppydownload/usr/local/bin/puppydownload
@@ -45,7 +45,7 @@ if [ ! $? -eq 0 ];then
  exit
 fi
 
- DESTDIR="`Xdialog --wmclass "puppyaxel" --title "Choose destination directory:" --wizard --no-cancel --help "if you leave the Selection field blank, the destination filename\nwill be the same as the source filename.\nOtherwise, type in the new name for the downloaded file." --stdout --dselect "/root/" 0 0 `"
+ DESTDIR="`Xdialog --wmclass "puppyaxel" --title "Choose destination directory:" --wizard --no-cancel --help "if you leave the Selection field blank, the destination filename\nwill be the same as the source filename.\nOtherwise, type in the new name for the downloaded file." --stdout --dselect "${HOME}/" 0 0 `"
 
  RETVAL=$?
  #note, returns 3 if "previous" button clicked.
diff --git a/puppy-unleashed/packages/Pawdioconverter-1.2-v1/usr/local/apps/Media/PawdioConverter/pawdioconverter b/puppy-unleashed/packages/Pawdioconverter-1.2-v1/usr/local/apps/Media/PawdioConverter/pawdioconverter
index 65ef936..9133dfd 100755
--- a/puppy-unleashed/packages/Pawdioconverter-1.2-v1/usr/local/apps/Media/PawdioConverter/pawdioconverter
+++ b/puppy-unleashed/packages/Pawdioconverter-1.2-v1/usr/local/apps/Media/PawdioConverter/pawdioconverter
@@ -22,7 +22,7 @@ fi
 BASE=`getdir $0`
 cd "$BASE"
 
-### the next step converts ./ to a full path like /root/test
+### the next step converts ./ to a full path like ${HOME}/test
 
 BASE=`pwd`
 cd "$BASE"
diff --git a/puppy-unleashed/packages/ShareInternet-1.4/etc/init.d/shareInternet b/puppy-unleashed/packages/ShareInternet-1.4/etc/init.d/shareInternet
index d70e5c0..f603500 100755
--- a/puppy-unleashed/packages/ShareInternet-1.4/etc/init.d/shareInternet
+++ b/puppy-unleashed/packages/ShareInternet-1.4/etc/init.d/shareInternet
@@ -3,8 +3,8 @@
 # Start or stop cleanup for shareInternet, based upon the first argument to the script.
 #
 
-if [ -f /root/.shareInternet/share.conf ]; then
-	. /root/.shareInternet/share.conf
+if [ -f ${HOME}/.shareInternet/share.conf ]; then
+	. ${HOME}/.shareInternet/share.conf
 fi
 
 case $1 in
@@ -13,10 +13,10 @@ case $1 in
 		;;
 
 	stop)
-		if [ -f /root/.shareInternet/flagFiles/sharingup.txt ]; then
+		if [ -f ${HOME}/.shareInternet/flagFiles/sharingup.txt ]; then
 			[ -x /usr/local/shareInternet/shareInternet ] && /usr/local/shareInternet/shareInternet stop
 		fi
-		[ -d /root/.shareInternet/flagFiles ] && rm -f /root/.shareInternet/flagFiles/*
+		[ -d ${HOME}/.shareInternet/flagFiles ] && rm -f ${HOME}/.shareInternet/flagFiles/*
 		;;
 
 	*)
diff --git a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/configFw b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/configFw
index a9e9b21..029ec6a 100755
--- a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/configFw
+++ b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/configFw
@@ -8,9 +8,9 @@ while [ -L "$APPDIR" ]; do
 done
 APPDIR="${APPDIR%\/*}"
 
-[ -f /root/.shareInternet/share.conf ] || "$APPDIR/firstTime"
+[ -f ${HOME}/.shareInternet/share.conf ] || "$APPDIR/firstTime"
 
-. /root/.shareInternet/share.conf
+. ${HOME}/.shareInternet/share.conf
 
 if [ "$INFO_BROWSER" == "" ]; then
 	INFO_BROWSER="`which bareview`"
diff --git a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/firstTime b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/firstTime
index 7d8a31c..1b538c6 100755
--- a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/firstTime
+++ b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/firstTime
@@ -3,12 +3,12 @@
 APPDIR="$0"
 APPDIR="${APPDIR%\/*}"
 
-[ -d /root/.shareInternet ] || mkdir /root/.shareInternet
-[ -d /root/.shareInternet/configs ] || cp -r "$APPDIR/home/configs" /root/.shareInternet/
-[ -d /root/.shareInternet/flagFiles ] || cp -r "$APPDIR/home/flagFiles" /root/.shareInternet/
-[ -f /root/.shareInternet/share.conf ] || cp "$APPDIR/home/share.conf" /root/.shareInternet/
-[ -f /root/.shareInternet/dnsmasq.conf ] || cp "$APPDIR/home/dnsmasq.conf" /root/.shareInternet/
-[ -f /root/.shareInternet/firewall.sh ] || cp "$APPDIR/home/firewall.sh" /root/.shareInternet/
-[ -f /root/.shareInternet/iptablesExtraRules ] || cp "$APPDIR/home/iptablesExtraRules" /root/.shareInternet/
+[ -d ${HOME}/.shareInternet ] || mkdir ${HOME}/.shareInternet
+[ -d ${HOME}/.shareInternet/configs ] || cp -r "$APPDIR/home/configs" ${HOME}/.shareInternet/
+[ -d ${HOME}/.shareInternet/flagFiles ] || cp -r "$APPDIR/home/flagFiles" ${HOME}/.shareInternet/
+[ -f ${HOME}/.shareInternet/share.conf ] || cp "$APPDIR/home/share.conf" ${HOME}/.shareInternet/
+[ -f ${HOME}/.shareInternet/dnsmasq.conf ] || cp "$APPDIR/home/dnsmasq.conf" ${HOME}/.shareInternet/
+[ -f ${HOME}/.shareInternet/firewall.sh ] || cp "$APPDIR/home/firewall.sh" ${HOME}/.shareInternet/
+[ -f ${HOME}/.shareInternet/iptablesExtraRules ] || cp "$APPDIR/home/iptablesExtraRules" ${HOME}/.shareInternet/
 
 exit 0
diff --git a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/getCurFwCfg b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/getCurFwCfg
index 9fd072a..028dc4d 100755
--- a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/getCurFwCfg
+++ b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/getCurFwCfg
@@ -1,7 +1,7 @@
 #!/bin/bash
 #Alan Agnew 2008 GPL
 
-. /root/.shareInternet/firewall.sh
+. ${HOME}/.shareInternet/firewall.sh
 echo "$INTERFACES"
 
 exit 0
diff --git a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/getFwCfgs b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/getFwCfgs
index 5e3714e..6c60e69 100755
--- a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/getFwCfgs
+++ b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/getFwCfgs
@@ -1,7 +1,7 @@
 #!/bin/bash
 #Alan Agnew 2008 GPL
 
-. /root/.shareInternet/share.conf
+. ${HOME}/.shareInternet/share.conf
 
 for XFN in `ls $STORDIR`; do
 	XFN=${XFN%.*}
diff --git a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/home/share.conf b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/home/share.conf
index 2405280..88f8295 100644
--- a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/home/share.conf
+++ b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/home/share.conf
@@ -1,12 +1,12 @@
-STORDIR="/root/.shareInternet/configs"
-ROXDIR="/root/my-roxapps/shareInternet"
+STORDIR="${HOME}/.shareInternet/configs"
+ROXDIR="${HOME}/my-roxapps/shareInternet"
 
 # This sets the width of the lists in the main config dialog
 CFG_TREE_WIDTH="260"
 # This sets the width of the lists in the choose interface dialog
 CHI_TREE_WIDTH="200"
 
-# To log errors to "/root/shareInternetErrors.txt" instead of being displayed,
+# To log errors to "${HOME}/shareInternetErrors.txt" instead of being displayed,
 # uncomment the following line
 #LOG_ERRORS="yes"
 
diff --git a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/installFwCfg b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/installFwCfg
index 8f4a698..1c7db93 100755
--- a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/installFwCfg
+++ b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/installFwCfg
@@ -26,6 +26,6 @@ if [ "$FWCFG" == "" ]; then
 	exit 1
 fi
 
-echo "INTERFACES=\"$FWCFG\"" > /root/.shareInternet/firewall.sh
+echo "INTERFACES=\"$FWCFG\"" > ${HOME}/.shareInternet/firewall.sh
 
 exit 0
diff --git a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/newFwCfg b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/newFwCfg
index 1943d4c..2ccae4f 100755
--- a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/newFwCfg
+++ b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/newFwCfg
@@ -4,7 +4,7 @@
 APPDIR="$0"
 APPDIR="${APPDIR%\/*}"
 
-. /root/.shareInternet/share.conf
+. ${HOME}/.shareInternet/share.conf
 
 error() {
 	export ERROR_DIALOG="
@@ -105,7 +105,7 @@ if [ "$UPDEV" != "" ]; then
 	echo "DYNAMIC_INTERFACES=\"$UPDEV\"" > "$CFGFN"
 	echo "INTERNAL_INTERFACES=\"$DDEVS\"" >> "$CFGFN"
 	echo "XD=\"$XDU$XDD\"" >> "$CFGFN"
-	echo "INTERFACES=\"${UPDEV}_${DDEVS%% *}\"" > /root/.shareInternet/firewall.sh
+	echo "INTERFACES=\"${UPDEV}_${DDEVS%% *}\"" > ${HOME}/.shareInternet/firewall.sh
 fi
 
 exit 0
diff --git a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/removeFwCfg b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/removeFwCfg
index 59bb727..7929642 100755
--- a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/removeFwCfg
+++ b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/removeFwCfg
@@ -4,7 +4,7 @@
 APPDIR="$0"
 APPDIR="${APPDIR%\/*}"
 
-. /root/.shareInternet/share.conf
+. ${HOME}/.shareInternet/share.conf
 
 error() {
 	export ERROR_DIALOG="
@@ -34,7 +34,7 @@ fi
 if [ "$FWCFG" == "`$APPDIR/getCurFwCfg`" ]; then
 #	error "'$FWCFG' is the Current Firewall config, not removed."
 #	exit 2
-	echo "INTERFACES=\"\"" > /root/.shareInternet/firewall.sh
+	echo "INTERFACES=\"\"" > ${HOME}/.shareInternet/firewall.sh
 
 fi
 
diff --git a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/shareInternet b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/shareInternet
index dabd310..708c992 100755
--- a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/shareInternet
+++ b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/shareInternet
@@ -7,13 +7,13 @@ while [ -L "$APPDIR" ]; do
 done
 APPDIR="${APPDIR%\/*}"
 
-[ -f /root/.shareInternet/share.conf ] || "$APPDIR/firstTime"
+[ -f ${HOME}/.shareInternet/share.conf ] || "$APPDIR/firstTime"
 
-. /root/.shareInternet/share.conf
-. /root/.shareInternet/dnsmasq.conf
-. /root/.shareInternet/firewall.sh
+. ${HOME}/.shareInternet/share.conf
+. ${HOME}/.shareInternet/dnsmasq.conf
+. ${HOME}/.shareInternet/firewall.sh
 
-[ "$LOG_ERRORS" == "yes" ] && touch /root/.shareInternet/flagFiles/logErrors.txt
+[ "$LOG_ERRORS" == "yes" ] && touch ${HOME}/.shareInternet/flagFiles/logErrors.txt
 
 error() {
 	export ERROR_DIALOG="
@@ -32,8 +32,8 @@ error() {
 	</vbox>
 	</window>
 	"
-	if [ -f /root/.shareInternet/flagFiles/logErrors.txt ]; then
-		echo "$1" >> /root/shareInternetErrors.txt
+	if [ -f ${HOME}/.shareInternet/flagFiles/logErrors.txt ]; then
+		echo "$1" >> ${HOME}/shareInternetErrors.txt
 	else
 		gtkdialog3 --program=ERROR_DIALOG --center
 	fi
@@ -41,7 +41,7 @@ error() {
 
 case $1 in
 	start)
-		[ -f /root/shareInternetErrors.txt ] && rm /root/shareInternetErrors.txt
+		[ -f ${HOME}/shareInternetErrors.txt ] && rm ${HOME}/shareInternetErrors.txt
 
 		X_REAL_IFCES=""
 		X_RI_COUNT=0
@@ -67,10 +67,10 @@ case $1 in
 					[ "$X_CFG" == "" ] && [ "$XONE" == "$X_CF2" ] && X_CFG="$XONE"
 				done
 				if [ "$X_CFG" != "" ]; then
-					echo "INTERFACES=\"$X_CFG\"" > /root/.shareInternet/firewall.sh
+					echo "INTERFACES=\"$X_CFG\"" > ${HOME}/.shareInternet/firewall.sh
 				else
 					"$APPDIR/newFwCfg"
-					X_CFG="`grep INTERFACES /root/.shareInternet/firewall.sh`"
+					X_CFG="`grep INTERFACES ${HOME}/.shareInternet/firewall.sh`"
 					X_CFG=${X_CFG#*\"}
 					X_CFG=${X_CFG%\"*}
 				fi
@@ -105,18 +105,18 @@ case $1 in
 		XINIP=${XINIP#*:}
 		XINIP=${XINIP%% *}
 		[ -x /etc/rc.d/rc.firewall ] && /etc/rc.d/rc.firewall start
-		[ -x /root/.shareInternet/iptablesExtraRules ] && /root/.shareInternet/iptablesExtraRules
+		[ -x ${HOME}/.shareInternet/iptablesExtraRules ] && ${HOME}/.shareInternet/iptablesExtraRules
 		XNET=${XINIP%.*}
 		[ -f /etc/dnsmasq.conf ] && dnsmasq -i "$XINIFCE" -F "$XNET.$DHCP_START,$XNET.$DHCP_END,$DHCP_TIME"
 
-		touch /root/.shareInternet/flagFiles/sharingup.txt
+		touch ${HOME}/.shareInternet/flagFiles/sharingup.txt
 		cp -d -f "$ROXDIR/up.png" "$ROXDIR/.DirIcon"
 		rox -x "$ROXDIR"
 		;;
 
 	stop)
-		rm -f /root/.shareInternet/flagFiles/sharingup.txt
-		rm -f /root/.shareInternet/flagFiles/logErrors.txt
+		rm -f ${HOME}/.shareInternet/flagFiles/sharingup.txt
+		rm -f ${HOME}/.shareInternet/flagFiles/logErrors.txt
 		
 		killall dnsmasq
 		[ -x /etc/rc.d/rc.firewall ] && /etc/rc.d/rc.firewall stop
diff --git a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/startAtBoot b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/startAtBoot
index ad20e69..4133f0c 100755
--- a/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/startAtBoot
+++ b/puppy-unleashed/packages/ShareInternet-1.4/usr/local/shareInternet/startAtBoot
@@ -6,8 +6,8 @@ while [ -L "$APPDIR" ]; do
 done
 APPDIR="${APPDIR%\/*}"
 
-if [ -f /root/.shareInternet/share.conf ]; then
-	. /root/.shareInternet/share.conf
+if [ -f ${HOME}/.shareInternet/share.conf ]; then
+	. ${HOME}/.shareInternet/share.conf
 	if [ "$BOOT_AS_ROUTER" == "yes" ]; then
 		[ "$BOOT_DELAY" != "" ] && sleep $BOOT_DELAY
 		"$APPDIR/shareInternet" start
diff --git a/puppy-unleashed/packages/axel-1.0a/usr/local/bin/puppydownload b/puppy-unleashed/packages/axel-1.0a/usr/local/bin/puppydownload
index 58d0a81..6d2afe8 100755
--- a/puppy-unleashed/packages/axel-1.0a/usr/local/bin/puppydownload
+++ b/puppy-unleashed/packages/axel-1.0a/usr/local/bin/puppydownload
@@ -45,7 +45,7 @@ if [ ! $? -eq 0 ];then
  exit
 fi
 
- DESTDIR="`Xdialog --wmclass "puppyaxel" --title "Choose destination directory:" --wizard --no-cancel --help "if you leave the Selection field blank, the destination filename\nwill be the same as the source filename.\nOtherwise, type in the new name for the downloaded file." --stdout --dselect "/root/" 0 0 `"
+ DESTDIR="`Xdialog --wmclass "puppyaxel" --title "Choose destination directory:" --wizard --no-cancel --help "if you leave the Selection field blank, the destination filename\nwill be the same as the source filename.\nOtherwise, type in the new name for the downloaded file." --stdout --dselect "${HOME}/" 0 0 `"
 
  RETVAL=$?
  #note, returns 3 if "previous" button clicked.
diff --git a/puppy-unleashed/packages/axel-2.3/usr/local/bin/puppydownload b/puppy-unleashed/packages/axel-2.3/usr/local/bin/puppydownload
index 58d0a81..6d2afe8 100755
--- a/puppy-unleashed/packages/axel-2.3/usr/local/bin/puppydownload
+++ b/puppy-unleashed/packages/axel-2.3/usr/local/bin/puppydownload
@@ -45,7 +45,7 @@ if [ ! $? -eq 0 ];then
  exit
 fi
 
- DESTDIR="`Xdialog --wmclass "puppyaxel" --title "Choose destination directory:" --wizard --no-cancel --help "if you leave the Selection field blank, the destination filename\nwill be the same as the source filename.\nOtherwise, type in the new name for the downloaded file." --stdout --dselect "/root/" 0 0 `"
+ DESTDIR="`Xdialog --wmclass "puppyaxel" --title "Choose destination directory:" --wizard --no-cancel --help "if you leave the Selection field blank, the destination filename\nwill be the same as the source filename.\nOtherwise, type in the new name for the downloaded file." --stdout --dselect "${HOME}/" 0 0 `"
 
  RETVAL=$?
  #note, returns 3 if "previous" button clicked.
diff --git a/puppy-unleashed/packages/chmsee-1.0.0-1/usr/bin/chmseeshell b/puppy-unleashed/packages/chmsee-1.0.0-1/usr/bin/chmseeshell
index 4218c5a..0a554ef 100755
--- a/puppy-unleashed/packages/chmsee-1.0.0-1/usr/bin/chmseeshell
+++ b/puppy-unleashed/packages/chmsee-1.0.0-1/usr/bin/chmseeshell
@@ -5,4 +5,4 @@
 
 chmsee
 
-rm -rf /root/.chmsee/bookshelf/*
+rm -rf ${HOME}/.chmsee/bookshelf/*
diff --git a/puppy-unleashed/packages/chmsee-1.0.0/usr/bin/chmseeshell b/puppy-unleashed/packages/chmsee-1.0.0/usr/bin/chmseeshell
index 156b010..a9f1933 100755
--- a/puppy-unleashed/packages/chmsee-1.0.0/usr/bin/chmseeshell
+++ b/puppy-unleashed/packages/chmsee-1.0.0/usr/bin/chmseeshell
@@ -4,4 +4,4 @@
 
 chmsee "$@"
 
-rm -rf /root/.chmsee/bookshelf/*
+rm -rf ${HOME}/.chmsee/bookshelf/*
diff --git a/puppy-unleashed/packages/didiwiki-0.5-5.1-pup1/usr/sbin/didiwiki-gui b/puppy-unleashed/packages/didiwiki-0.5-5.1-pup1/usr/sbin/didiwiki-gui
index 9730bc8..e5ecb3e 100755
--- a/puppy-unleashed/packages/didiwiki-0.5-5.1-pup1/usr/sbin/didiwiki-gui
+++ b/puppy-unleashed/packages/didiwiki-0.5-5.1-pup1/usr/sbin/didiwiki-gui
@@ -5,7 +5,7 @@
 # GuestToo - Feb 7, 2005. Hacked a bit by BK -- 2005,2006.
 # Designed for use with Puppy Linux, www.puppylinux.com
 
-DIDI="/root/spot/didiwiki"
+DIDI="${HOME}/spot/didiwiki"
 
 if ! MSG=`which gxmessage`
 then
@@ -50,7 +50,7 @@ case $? in
 RETVAL1=0
 if [ "$DIDIGO" = "no" ];then
  su -c $DIDI - spot &
- #note, .didiwiki folder is created in /root/spot/.
+ #note, .didiwiki folder is created in ${HOME}/spot/.
  RETVAL1=$?
 fi
 if [ $RETVAL1 -eq 0 ];then
diff --git a/puppy-unleashed/packages/didiwiki-0.5-5.1-pup2/usr/sbin/didiwiki-gui b/puppy-unleashed/packages/didiwiki-0.5-5.1-pup2/usr/sbin/didiwiki-gui
index cb727c7..dcea416 100755
--- a/puppy-unleashed/packages/didiwiki-0.5-5.1-pup2/usr/sbin/didiwiki-gui
+++ b/puppy-unleashed/packages/didiwiki-0.5-5.1-pup2/usr/sbin/didiwiki-gui
@@ -4,13 +4,13 @@
 # ASSUMES A USER NAMED spot HAS BEEN SETUP
 # GuestToo - Feb 7, 2005. Hacked a bit by BK -- 2005,2006.
 # Designed for use with Puppy Linux, www.puppylinux.com
-#v411 dunno why, but no longer creates new pages, needs /root/spot/.didiwiki world-writable.
+#v411 dunno why, but no longer creates new pages, needs ${HOME}/spot/.didiwiki world-writable.
 
 #v411 bug workaround, needs to be fixed properly sometime...
-mkdir -p /root/spot/.didiwiki
-chmod 777 /root/spot/.didiwiki
+mkdir -p ${HOME}/spot/.didiwiki
+chmod 777 ${HOME}/spot/.didiwiki
 
-DIDI="/root/spot/didiwiki"
+DIDI="${HOME}/spot/didiwiki"
 
 if ! MSG=`which gxmessage`
 then
@@ -55,7 +55,7 @@ case $? in
 RETVAL1=0
 if [ "$DIDIGO" = "no" ];then
  su -c $DIDI - spot &
- #note, .didiwiki folder is created in /root/spot/.
+ #note, .didiwiki folder is created in ${HOME}/spot/.
  RETVAL1=$?
 fi
 if [ $RETVAL1 -eq 0 ];then
diff --git a/puppy-unleashed/packages/dotpuphandler-0.0.4-2/usr/sbin/dotpuprmtmpdir b/puppy-unleashed/packages/dotpuphandler-0.0.4-2/usr/sbin/dotpuprmtmpdir
index 4685bc0..09314e8 100755
--- a/puppy-unleashed/packages/dotpuphandler-0.0.4-2/usr/sbin/dotpuprmtmpdir
+++ b/puppy-unleashed/packages/dotpuphandler-0.0.4-2/usr/sbin/dotpuprmtmpdir
@@ -2,8 +2,8 @@
 
 # do not use rm -rf $DPDIR or rm -rf $1 without sanity checks
 
-rm -r /root/DotPupTmpDir #symlink?
+rm -r ${HOME}/DotPupTmpDir #symlink?
 rm -r /tmp/DotPupTmpDir
 
-rm -rf /root/DotPupTmpDir
+rm -rf ${HOME}/DotPupTmpDir
 rm -rf /tmp/DotPupTmpDir
diff --git a/puppy-unleashed/packages/glipper-0.89-1/usr/local/bin/glipper_shell b/puppy-unleashed/packages/glipper-0.89-1/usr/local/bin/glipper_shell
index f3ea078..25af0cd 100755
--- a/puppy-unleashed/packages/glipper-0.89-1/usr/local/bin/glipper_shell
+++ b/puppy-unleashed/packages/glipper-0.89-1/usr/local/bin/glipper_shell
@@ -11,14 +11,14 @@ it will be terminated now and will not be started in the future." 0 0
 RETVAL=$?
 
 if [ $RETVAL -eq 0 ];then
- touch /root/.glipper_on
+ touch ${HOME}/.glipper_on
  PSRUN="`ps`"
  [ "`echo "$PSRUN" | grep -v 'glipper_shell' | grep 'glipper'`" = "" ] && glipper &
  exit
 fi
 
 if [ $RETVAL -eq 1 ];then
- rm -f /root/.glipper_on
+ rm -f ${HOME}/.glipper_on
  killall glipper
  exit
 fi
diff --git a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/HotPup.sh b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/HotPup.sh
index 12e9efe..aeaf57f 100755
--- a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/HotPup.sh
+++ b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/HotPup.sh
@@ -36,7 +36,7 @@ APPDIR="`dirname $0`"
 [ "$APPDIR" = "." ] && APPDIR="`pwd`"
 # files used
 FSTAB="/etc/fstab"
-PINFILE="/root/Choices/ROX-Filer/PuppyPin"
+PINFILE="${HOME}/Choices/ROX-Filer/PuppyPin"
 #PINFILE=$HOME/.config/rox.sourceforge.net/ROX-Filer/pb_Default
 #####
 
diff --git a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device1 b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device1
index 661dcd6..fe3dd14 100755
--- a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device1
+++ b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device1
@@ -24,7 +24,7 @@ PUPPYVERSION="`cat /etc/puppyversion`" #v3.98
 APPDIR="`dirname $0`"
 [ "$APPDIR" = "." ] && APPDIR="`pwd`"
 # files used
-PINFILE=/root/Choices/ROX-Filer/PuppyPin
+PINFILE=${HOME}/Choices/ROX-Filer/PuppyPin
 #PINFILE=$HOME/.config/rox.sourceforge.net/ROX-Filer/pb_Default
 FSTAB=/etc/fstab
 
diff --git a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device2 b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device2
index 318ec60..913d42c 100755
--- a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device2
+++ b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device2
@@ -24,7 +24,7 @@ PUPPYVERSION="`cat /etc/puppyversion`" #v3.98
 APPDIR="`dirname $0`"
 [ "$APPDIR" = "." ] && APPDIR="`pwd`"
 # files used
-PINFILE=/root/Choices/ROX-Filer/PuppyPin
+PINFILE=${HOME}/Choices/ROX-Filer/PuppyPin
 #PINFILE=$HOME/.config/rox.sourceforge.net/ROX-Filer/pb_Default
 FSTAB=/etc/fstab
 
diff --git a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device3 b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device3
index 3a31342..145e514 100755
--- a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device3
+++ b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device3
@@ -24,7 +24,7 @@ PUPPYVERSION="`cat /etc/puppyversion`" #v3.98
 APPDIR="`dirname $0`"
 [ "$APPDIR" = "." ] && APPDIR="`pwd`"
 # files used
-PINFILE=/root/Choices/ROX-Filer/PuppyPin
+PINFILE=${HOME}/Choices/ROX-Filer/PuppyPin
 #PINFILE=$HOME/.config/rox.sourceforge.net/ROX-Filer/pb_Default
 FSTAB=/etc/fstab
 
diff --git a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device4 b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device4
index 14907da..e95bd34 100755
--- a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device4
+++ b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device4
@@ -24,7 +24,7 @@ PUPPYVERSION="`cat /etc/puppyversion`" #v3.98
 APPDIR="`dirname $0`"
 [ "$APPDIR" = "." ] && APPDIR="`pwd`"
 # files used
-PINFILE=/root/Choices/ROX-Filer/PuppyPin
+PINFILE=${HOME}/Choices/ROX-Filer/PuppyPin
 #PINFILE=$HOME/.config/rox.sourceforge.net/ROX-Filer/pb_Default
 FSTAB=/etc/fstab
 
diff --git a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device5 b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device5
index b572b56..1078dfb 100755
--- a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device5
+++ b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device5
@@ -24,7 +24,7 @@ PUPPYVERSION="`cat /etc/puppyversion`" #v3.98
 APPDIR="`dirname $0`"
 [ "$APPDIR" = "." ] && APPDIR="`pwd`"
 # files used
-PINFILE=/root/Choices/ROX-Filer/PuppyPin
+PINFILE=${HOME}/Choices/ROX-Filer/PuppyPin
 #PINFILE=$HOME/.config/rox.sourceforge.net/ROX-Filer/pb_Default
 FSTAB=/etc/fstab
 
diff --git a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device6 b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device6
index 4e7c188..19ded72 100755
--- a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device6
+++ b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device6
@@ -24,7 +24,7 @@ PUPPYVERSION="`cat /etc/puppyversion`" #v3.98
 APPDIR="`dirname $0`"
 [ "$APPDIR" = "." ] && APPDIR="`pwd`"
 # files used
-PINFILE=/root/Choices/ROX-Filer/PuppyPin
+PINFILE=${HOME}/Choices/ROX-Filer/PuppyPin
 #PINFILE=$HOME/.config/rox.sourceforge.net/ROX-Filer/pb_Default
 FSTAB=/etc/fstab
 
diff --git a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device7 b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device7
index e8c5b9b..bb40bdf 100755
--- a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device7
+++ b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device7
@@ -24,7 +24,7 @@ PUPPYVERSION="`cat /etc/puppyversion`" #v3.98
 APPDIR="`dirname $0`"
 [ "$APPDIR" = "." ] && APPDIR="`pwd`"
 # files used
-PINFILE=/root/Choices/ROX-Filer/PuppyPin
+PINFILE=${HOME}/Choices/ROX-Filer/PuppyPin
 #PINFILE=$HOME/.config/rox.sourceforge.net/ROX-Filer/pb_Default
 FSTAB=/etc/fstab
 
diff --git a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device8 b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device8
index 7b9d78a..a88695a 100755
--- a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device8
+++ b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/add_icons_for_device8
@@ -24,7 +24,7 @@ PUPPYVERSION="`cat /etc/puppyversion`" #v3.98
 APPDIR="`dirname $0`"
 [ "$APPDIR" = "." ] && APPDIR="`pwd`"
 # files used
-PINFILE=/root/Choices/ROX-Filer/PuppyPin
+PINFILE=${HOME}/Choices/ROX-Filer/PuppyPin
 #PINFILE=$HOME/.config/rox.sourceforge.net/ROX-Filer/pb_Default
 FSTAB=/etc/fstab
 
diff --git a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/remove_icons_for_device b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/remove_icons_for_device
index fac6359..d5b503b 100755
--- a/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/remove_icons_for_device
+++ b/puppy-unleashed/packages/hotpup-20080313-3/etc/HotPup/remove_icons_for_device
@@ -9,7 +9,7 @@
 ADEV="$1"
 
 ## files used:
-PINFILE=/root/Choices/ROX-Filer/PuppyPin
+PINFILE=${HOME}/Choices/ROX-Filer/PuppyPin
 #PINFILE=$HOME/.config/rox.sourceforge.net/ROX-Filer/pb_Default
 FSTAB=/etc/fstab
 
diff --git a/puppy-unleashed/packages/httpd-2.2.11-i386/usr/bin/apr-1-config b/puppy-unleashed/packages/httpd-2.2.11-i386/usr/bin/apr-1-config
index 6a18198..12669c2 100755
--- a/puppy-unleashed/packages/httpd-2.2.11-i386/usr/bin/apr-1-config
+++ b/puppy-unleashed/packages/httpd-2.2.11-i386/usr/bin/apr-1-config
@@ -39,8 +39,8 @@ LDFLAGS=""
 LIBS="-luuid -lrt -lcrypt  -lpthread -ldl"
 EXTRA_INCLUDES=""
 SHLIBPATH_VAR="LD_LIBRARY_PATH"
-APR_SOURCE_DIR="/root/httpd-2.2.11/srclib/apr"
-APR_BUILD_DIR="/root/httpd-2.2.11/srclib/apr"
+APR_SOURCE_DIR="${HOME}/httpd-2.2.11/srclib/apr"
+APR_BUILD_DIR="${HOME}/httpd-2.2.11/srclib/apr"
 APR_SO_EXT="lo"
 APR_LIB_TARGET="-rpath \$(libdir) \$(OBJECTS)"
 APR_LIBNAME="apr-${APR_MAJOR_VERSION}"
diff --git a/puppy-unleashed/packages/httpd-2.2.11-i386/usr/bin/apu-1-config b/puppy-unleashed/packages/httpd-2.2.11-i386/usr/bin/apu-1-config
index 30fb145..7f349b6 100755
--- a/puppy-unleashed/packages/httpd-2.2.11-i386/usr/bin/apu-1-config
+++ b/puppy-unleashed/packages/httpd-2.2.11-i386/usr/bin/apu-1-config
@@ -34,8 +34,8 @@ LDAP_LIBS=""
 
 APRUTIL_LIBNAME="aprutil-${APRUTIL_MAJOR_VERSION}"
 
-APU_SOURCE_DIR="/root/httpd-2.2.11/srclib/apr-util"
-APU_BUILD_DIR="/root/httpd-2.2.11/srclib/apr-util"
+APU_SOURCE_DIR="${HOME}/httpd-2.2.11/srclib/apr-util"
+APU_BUILD_DIR="${HOME}/httpd-2.2.11/srclib/apr-util"
 APR_XML_EXPAT_OLD="@APR_XML_EXPAT_OLD@"
 APU_DB_VERSION="0"
 
diff --git a/puppy-unleashed/packages/httpd-2.2.11-i386/usr/build/libtool b/puppy-unleashed/packages/httpd-2.2.11-i386/usr/build/libtool
index b3c6dc0..c26a33f 100755
--- a/puppy-unleashed/packages/httpd-2.2.11-i386/usr/build/libtool
+++ b/puppy-unleashed/packages/httpd-2.2.11-i386/usr/build/libtool
@@ -332,7 +332,7 @@ link_all_deplibs=unknown
 sys_lib_search_path_spec="/usr/lib/gcc/i486-t2-linux-gnu/4.2.2 /usr/i486-t2-linux-gnu/lib /usr/lib /lib"
 
 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /lib /usr/lib /usr/X11R7/lib /opt/qt4/lib /opt/mozilla.org/lib /opt/samba/lib /root/my-applications/lib "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib /usr/lib /usr/X11R7/lib /opt/qt4/lib /opt/mozilla.org/lib /opt/samba/lib ${HOME}/my-applications/lib "
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
@@ -7597,7 +7597,7 @@ link_all_deplibs=unknown
 sys_lib_search_path_spec="/usr/lib/gcc/i486-t2-linux-gnu/4.2.2 /usr/i486-t2-linux-gnu/lib /usr/lib /lib"
 
 # Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /lib /usr/lib /usr/X11R7/lib /opt/qt4/lib /opt/mozilla.org/lib /opt/samba/lib /root/my-applications/lib "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /lib /usr/lib /usr/X11R7/lib /opt/qt4/lib /opt/mozilla.org/lib /opt/samba/lib ${HOME}/my-applications/lib "
 
 # Fix the shell variable $srcfile for the compiler.
 fix_srcfile_path=""
diff --git a/puppy-unleashed/packages/icewm-402-v9/usr/share/icewm/startup b/puppy-unleashed/packages/icewm-402-v9/usr/share/icewm/startup
index dd437b8..1638f7f 100755
--- a/puppy-unleashed/packages/icewm-402-v9/usr/share/icewm/startup
+++ b/puppy-unleashed/packages/icewm-402-v9/usr/share/icewm/startup
@@ -12,8 +12,8 @@ killall parcellite
 sleep 2 && /usr/bin/parcellite &
 
 killall freememapplet-tray
-sleep 7 && /root/my-applications/freememapplet_tray_puppy215ce/freememapplet-tray &
+sleep 7 && ${HOME}/my-applications/freememapplet_tray_puppy215ce/freememapplet-tray &
 
 killall blinky
-sleep 4 && /root/my-applications/blinky-0.8-icewm/src/blinky -bg "#000000" &
-#sleep 2 && /root/my-applications/blinky-0.8-icewm/src/blinky -bg "#49437a" &
+sleep 4 && ${HOME}/my-applications/blinky-0.8-icewm/src/blinky -bg "#000000" &
+#sleep 2 && ${HOME}/my-applications/blinky-0.8-icewm/src/blinky -bg "#49437a" &
diff --git a/puppy-unleashed/packages/jwm2-2.0.1-9-pup420/usr/local/jwmconfig2/theme_switcher b/puppy-unleashed/packages/jwm2-2.0.1-9-pup420/usr/local/jwmconfig2/theme_switcher
index a592f5e..25051e5 100755
--- a/puppy-unleashed/packages/jwm2-2.0.1-9-pup420/usr/local/jwmconfig2/theme_switcher
+++ b/puppy-unleashed/packages/jwm2-2.0.1-9-pup420/usr/local/jwmconfig2/theme_switcher
@@ -6,13 +6,13 @@
 #  <text><label>\"${CHARPAD}\"</label></text>
 
 ICONSETSGUI=""
-for ONETHEME in `find /root/.jwm/themes/ -mindepth 1 -maxdepth 1 -type f | grep 'jwmrc' | sed -e 's/-jwmrc//' | tr '\n' ' '`
+for ONETHEME in `find ${HOME}/.jwm/themes/ -mindepth 1 -maxdepth 1 -type f | grep 'jwmrc' | sed -e 's/-jwmrc//' | tr '\n' ' '`
 do
  ONETHEME="`basename $ONETHEME`"
  ICONSETSGUI="$ICONSETSGUI
  <hbox>
-  <pixmap><input file>/root/.jwm/themes/${ONETHEME}-tray.png</input></pixmap>
-  <pixmap><input file>/root/.jwm/themes/${ONETHEME}-window.png</input></pixmap>
+  <pixmap><input file>${HOME}/.jwm/themes/${ONETHEME}-tray.png</input></pixmap>
+  <pixmap><input file>${HOME}/.jwm/themes/${ONETHEME}-window.png</input></pixmap>
   <vbox>
    <pixmap><input file>/usr/local/lib/X11/pixmaps/invisible96x8.png</input></pixmap>
    <button><label>${ONETHEME}</label></button>
@@ -43,22 +43,22 @@ eval "$RETSTUFF"
 
 NEWTHEME="$EXIT"
 [ "$NEWTHEME" = "" ] && exit
-[ ! -f /root/.jwm/themes/${NEWTHEME}-jwmrc ] && exit
+[ ! -f ${HOME}/.jwm/themes/${NEWTHEME}-jwmrc ] && exit
 
 if [ "$NEWTHEME" != "" ];then
  #select chosen theme...
- cp -f /root/.jwm/themes/${NEWTHEME}-jwmrc /root/.jwm/jwmrc-theme
+ cp -f ${HOME}/.jwm/themes/${NEWTHEME}-jwmrc ${HOME}/.jwm/jwmrc-theme
  #set correct backgrounds for applets...
- cp -f /root/.jwm/themes/${NEWTHEME}-colors /root/.jwm/jwm_colors
- #...note, /root/.xinitrc reads this file to set background for absvolume.
+ cp -f ${HOME}/.jwm/themes/${NEWTHEME}-colors ${HOME}/.jwm/jwm_colors
+ #...note, ${HOME}/.xinitrc reads this file to set background for absvolume.
  #...note, jwm_colors is written to by /usr/local/jwmconfig2/gtk2jwm script
 
-. /root/.jwm/jwm_colors #gives MENU_BG, PAGER_BG
+. ${HOME}/.jwm/jwm_colors #gives MENU_BG, PAGER_BG
 
  #########
  #John Doe created code for the applet backgrounds, old jwmconfig, port here...
- TrayFile="/root/.jwmrc-tray"
- TrayFileBak="/root/.jwmrc-tray.bak"
+ TrayFile="${HOME}/.jwmrc-tray"
+ TrayFileBak="${HOME}/.jwmrc-tray.bak"
 
  BackgroundColor="$MENU_BG" #"#ffc100"
  [ "$BackgroundColor" = "" ] && BackgroundColor='#ffc100'
diff --git a/puppy-unleashed/packages/jwm2-2.0.1-9-pup420/usr/sbin/icon_switcher b/puppy-unleashed/packages/jwm2-2.0.1-9-pup420/usr/sbin/icon_switcher
index 1893edc..7bc8ed2 100755
--- a/puppy-unleashed/packages/jwm2-2.0.1-9-pup420/usr/sbin/icon_switcher
+++ b/puppy-unleashed/packages/jwm2-2.0.1-9-pup420/usr/sbin/icon_switcher
@@ -117,7 +117,7 @@ Click OK button and you will see them...\"</label></text>
 </window>"
  gtkdialog3 --program=ENDGUI
 
- rox -p=/root/Choices/ROX-Filer/PuppyPin
+ rox -p=${HOME}/Choices/ROX-Filer/PuppyPin
  fixwidgets &
  jwm -restart
 
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/addShortcut b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/addShortcut
index e1f1ce1..39fa002 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/addShortcut
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/addShortcut
@@ -19,8 +19,8 @@ TMP1="/tmp/addmask.tmp.$$"
 TMP2="/tmp/maskkey.tmp.$$"
 MASKKEY=
 INSERT=/bindings/a\ 
-CONF_FILE=/root/.jwm/jwmrc-personal
-CONF_FILE2=/root/.jwm/jwmrc-personal2
+CONF_FILE=${HOME}/.jwm/jwmrc-personal
+CONF_FILE2=${HOME}/.jwm/jwmrc-personal2
 
 #-----------add shortcut------->
 
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/changeKey b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/changeKey
index 4d2a10f..93588ba 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/changeKey
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/changeKey
@@ -24,7 +24,7 @@ M=
 MASK=`echo $KEY | grep -c mask`
 A=
 TMPFILE="/tmp/shortcut"
-#SCRIPT_DIR="/root/.jwm"
+#SCRIPT_DIR="${HOME}/.jwm"
 SCRIPT_DIR="/usr/local/jwmconfig"
 ID=
 
@@ -59,7 +59,7 @@ fi
 
 echo res $RES
 
-KEYLINE=`grep "$RES" /root/.jwm/jwmrc-personal`
+KEYLINE=`grep "$RES" ${HOME}/.jwm/jwmrc-personal`
 
 #xmessage -name "Current Details" -nearmouse "Current shortcut details:  $KEYLINE" &
    echo $KEYLINE
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/confirmKey b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/confirmKey
index 618f2b7..6ee2784 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/confirmKey
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/confirmKey
@@ -24,8 +24,8 @@ OLD=
 OLDFILE="/tmp/short"
 CHANGE_SED=
 DEL_SED=
-CONF_FILE=/root/.jwm/jwmrc-personal
-CONF_FILE2=/root/.jwm/jwmrc-personal2
+CONF_FILE=${HOME}/.jwm/jwmrc-personal
+CONF_FILE2=${HOME}/.jwm/jwmrc-personal2
 TEST=
 
 ##------confirmation--------->>
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/default b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/default
index 81380ac..143477a 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/default
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/default
@@ -16,8 +16,8 @@
 
 #--------variables---------->>
 
-CONFIG="/root/.jwm/jwmrc-personal"
-CONFSAVE="/root/.jwm/jwmrc-personal-save"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONFSAVE="${HOME}/.jwm/jwmrc-personal-save"
 
 CHOICE=default
 DEFAULT=
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/focusModel b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/focusModel
index 428cd2f..ad89826 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/focusModel
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/focusModel
@@ -6,9 +6,9 @@
 
 CLICK='<FocusModel>click</FocusModel>'
 SLOPPY='<FocusModel>sloppy</FocusModel>'
-CONFIG="/root/.jwm/jwmrc-personal"
-CONF="/root/.jwm/jwmrc-personal-temp"
-CONF2="/root/.jwm/jwmrc-personal-temp2"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONF="${HOME}/.jwm/jwmrc-personal-temp"
+CONF2="${HOME}/.jwm/jwmrc-personal-temp2"
 TMP="/tmp/inputbox.tmp.$$"
 
 CHOICE=click
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/gtk2jwm b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/gtk2jwm
index 9454b87..1c084b0 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/gtk2jwm
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/gtk2jwm
@@ -30,7 +30,7 @@
 
 GTKTHEME=/etc/gtk/gtkrc
 CURRENT=`cat /etc/gtk/current-theme`
-JWMTHEME=/root/.jwm/themes/jwm-default
+JWMTHEME=${HOME}/.jwm/themes/jwm-default
 
 MENU_BG=
 ACTIVE_BG=
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/jwmConfigMgr b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/jwmConfigMgr
index 38bb617..bd4dddd 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/jwmConfigMgr
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/jwmConfigMgr
@@ -36,9 +36,9 @@
 
 ##--------variables---------->>
 
-#SCRIPT_DIR="/root/.jwm"
+#SCRIPT_DIR="${HOME}/.jwm"
 SCRIPT_DIR="/usr/local/jwmconfig"
-#IMAGES_DIR="/root/.jwm/images"
+#IMAGES_DIR="${HOME}/.jwm/images"
 IMAGES_DIR="/usr/local/jwmconfig/images"
 MINI_ICONS_DIR="/usr/local/lib/X11/mini-icons"
 
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/jwmThemeSwitcher b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/jwmThemeSwitcher
index befbc8b..e9fd0a8 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/jwmThemeSwitcher
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/jwmThemeSwitcher
@@ -8,12 +8,12 @@
 
 
 ##---------------------variables-------------------->>
-THEMES=`cat /root/.jwm/themes/themeslist`
-FIN="/root/.jwmrc"
-FOUT="/root/.jwmrcNew"
+THEMES=`cat ${HOME}/.jwm/themes/themeslist`
+FIN="${HOME}/.jwmrc"
+FOUT="${HOME}/.jwmrcNew"
 INCTEST=0
 RETVAL=$?
-NOTHEMES=`grep -c jwm /root/.jwm/themes/themeslist`
+NOTHEMES=`grep -c jwm ${HOME}/.jwm/themes/themeslist`
 TEST=""
 FILETEST="empty"
 
@@ -36,9 +36,9 @@ esac
 
 ##-----------parse results and prep to write ------->>
 CHOICE=`cat /tmp/menu.tmp.$$`
-BGSCRIPT="/root/.jwm/themes/bg-$CHOICE"
+BGSCRIPT="${HOME}/.jwm/themes/bg-$CHOICE"
 
-INCTEST=`grep -c "<Include>/root/.jwm/themes*" $FIN`
+INCTEST=`grep -c "<Include>${HOME}/.jwm/themes*" $FIN`
 FULLINC="\<Include\>\/root\/\.jwm\/themes\/$CHOICE\<\/Include\>"
 SUB="/$PERSONALCFG/i\ "
 SUBINCLUDE=$SUB$FULLINC
@@ -59,7 +59,7 @@ fi
 #John Doe, comment out...
 #if [ "$CHOICE" = "jwm-default" ]; then
 #    #sed $SEDDEFAULT $FIN > $FOUT
-#    echo  > /root/.jwm/themes/jwm-default
+#    echo  > ${HOME}/.jwm/themes/jwm-default
 #fi
 
    if [ $INCTEST -eq 0 ]; then
@@ -70,7 +70,7 @@ fi
    fi
 
    ##---test config file ok--->>
-   TEST=`grep "<Include>/root/.jwm/themes*" $FOUT`
+   TEST=`grep "<Include>${HOME}/.jwm/themes*" $FOUT`
 
    if [ "$TEST" = "" ]; then
      Xdialog --title "Error" --infobox "There was an error writing your choice\nto the config file.\nPlease try again." 0 0 20000 
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/keyboard b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/keyboard
index 5c7ac89..08ed151 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/keyboard
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/keyboard
@@ -15,7 +15,7 @@
 
 ##-------variables----------->>
 ##-------variables------->>
-HOME_DIR=/root/.jwm
+HOME_DIR=${HOME}/.jwm
 SCRIPT_DIR="/usr/local/jwmconfig"
 IMAGES_DIR="/usr/local/jwmconfig/images"
 MINI_ICONS_DIR="/usr/local/lib/X11/mini-icons"
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/listShortcuts b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/listShortcuts
index 75622a8..c468e33 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/listShortcuts
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/listShortcuts
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-HOME_DIR=/root/.jwm
+HOME_DIR=${HOME}/.jwm
 SCRIPT_DIR="/usr/local/jwmconfig"
 
 ##----lists shortcuts contained in the jwmrc-personal file---->>
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/panel-buttons b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/panel-buttons
index 20b681f..cc6a0e2 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/panel-buttons
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/panel-buttons
@@ -9,21 +9,21 @@
 #
 #####################################
 
-if [ "`ls /root/.jwmrc-tray-bak`" = "" ]; then
-cp /root/.jwmrc-tray /root/.jwmrc-tray-bak  ### makes .jwmrc-tray-bak backup file unless it already exists
+if [ "`ls ${HOME}/.jwmrc-tray-bak`" = "" ]; then
+cp ${HOME}/.jwmrc-tray ${HOME}/.jwmrc-tray-bak  ### makes .jwmrc-tray-bak backup file unless it already exists
 fi
-cat /root/.jwmrc-tray | sed '/^$/d' > /tmp/.jwmrc-tray  ### remove all blank lines in .jwmrc-tray
-mv /tmp/.jwmrc-tray /root/
+cat ${HOME}/.jwmrc-tray | sed '/^$/d' > /tmp/.jwmrc-tray  ### remove all blank lines in .jwmrc-tray
+mv /tmp/.jwmrc-tray ${HOME}/
 
-total=`wc -l /root/.jwmrc-tray | sed -e 's/ *//' | sed -e 's/ .*//g'` ### get total number of lines
-low=`grep '<TrayButton label="Menu"'  -n /root/.jwmrc-tray | sed -e 's/\:.*>//g'`  ### get line number with the Menu button
-high=`grep '<!-- Additional Pager attributes; width, height -->' -n /root/.jwmrc-tray | sed -e 's/\:.*>//g'` ### get line number with Additional Pager
+total=`wc -l ${HOME}/.jwmrc-tray | sed -e 's/ *//' | sed -e 's/ .*//g'` ### get total number of lines
+low=`grep '<TrayButton label="Menu"'  -n ${HOME}/.jwmrc-tray | sed -e 's/\:.*>//g'`  ### get line number with the Menu button
+high=`grep '<!-- Additional Pager attributes; width, height -->' -n ${HOME}/.jwmrc-tray | sed -e 's/\:.*>//g'` ### get line number with Additional Pager
 last=`echo "(("$total" - "$high" + 2))" | bc -l` 
 begin=`echo "(("$low" + 1))" | bc -l` ### first line with panel buttons
 #end=`echo "(("$high" - 1))" | bc -l` ### last line with panel buttons
 
-cat /root/.jwmrc-tray | head -n "$low" > /tmp/jwmrc-tray-1.txt
-cat /root/.jwmrc-tray | tail -n "$last" > /tmp/jwmrc-tray-3.txt
+cat ${HOME}/.jwmrc-tray | head -n "$low" > /tmp/jwmrc-tray-1.txt
+cat ${HOME}/.jwmrc-tray | tail -n "$last" > /tmp/jwmrc-tray-3.txt
 
 num=1
 
@@ -70,7 +70,7 @@ case $? in
     echo "Box closed.";;
 esac
 
-cp /root/.jwmrc-tray /root/.jwmrc-tray-bak
+cp ${HOME}/.jwmrc-tray ${HOME}/.jwmrc-tray-bak
 exit 0
 fi
 
@@ -82,11 +82,11 @@ if [ "$choice" = Edit ]; then
 
 while [ "$begin" != "$high" ]; do
 
-cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-popup.txt  ### gets popup text
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-popup.txt  ### gets popup text
 popup=`cat /tmp/tmp-popup.txt`
-cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e "s/$popup//" | sed -e 's/" icon="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-icon.txt  ### gets icon text
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e "s/$popup//" | sed -e 's/" icon="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-icon.txt  ### gets icon text
 icon=`cat /tmp/tmp-icon.txt`
-cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed 's/\<.*\"//g' | sed -e 's/<\/TrayButton>//' | sed -e 's/<>//' | sed 's/^[ \t]*//' > /tmp/tmp-exec.txt  ### gets executable text
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed 's/\<.*\"//g' | sed -e 's/<\/TrayButton>//' | sed -e 's/<>//' | sed 's/^[ \t]*//' > /tmp/tmp-exec.txt  ### gets executable text
 #action=`cat /tmp/tmp-exec.txt`
 
 ### This is the Edit gui
@@ -150,7 +150,7 @@ done
 
 cat /tmp/jwmrc-tray-2.txt >> /tmp/jwmrc-tray-1.txt
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 rm -f /tmp/jwmrc-tray-*
 rm -f /tmp/tmp-popup*.txt
@@ -173,7 +173,7 @@ fi
 
 if [ "$choice" = Restore ]; then
 
-mv /root/.jwmrc-tray-bak /root/.jwmrc-tray
+mv ${HOME}/.jwmrc-tray-bak ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Your original .jwmrc-tray
@@ -191,7 +191,7 @@ fi
 
 if [ "$choice" = Add ]; then
 while [ "$begin" != "$high" ]; do
-cat /root/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel.txt
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel.txt
 begin=`echo "(("$begin" + 1))" | bc -l`
 shift
 done
@@ -246,7 +246,7 @@ echo "$new_line" >> /tmp/jwmrc-tray-panel.txt
 
 cat /tmp/jwmrc-tray-panel.txt >> /tmp/jwmrc-tray-1.txt
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Adding complete.
@@ -278,7 +278,7 @@ while [ "$begin" != "$high" ]; do
 
 Xdialog --backtitle "Remove panel buttons" \
 	--title "RADIOLIST BOX" \
-        --radiolist "Would you like to delete `cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'`\n\
+        --radiolist "Would you like to delete `cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'`\n\
 from the panel? If you want to delete it choose\n\
 yes, otherwise choose no." 26 46 5 \
         "no"    "no do not delete this button" ON \
@@ -298,7 +298,7 @@ case $retval in
 esac
 
 if [ "$choice" = no ]; then
-cat /root/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-1.txt
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-1.txt
 fi
 begin=`echo "(("$begin" + 1))" | bc -l`
 y=`echo "(("$y" + 1))" | bc -l`
@@ -307,7 +307,7 @@ shift
 done
 
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Removing complete.
@@ -327,10 +327,10 @@ if [ "$choice" = Move ]; then
 y=1
 z=`echo "(("$high" - "$begin"))" | bc -l`
 while [ "$begin" != "$high" ]; do
-cat /root/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel-"$y".txt
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel-"$y".txt
 
 Xdialog --title "INPUT BOX" \
-        --inputbox "`cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'` is button $y of your $z buttons.\n\
+        --inputbox "`cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'` is button $y of your $z buttons.\n\
 \n\
 If you would like that button in another\n\
 position please enter the number below." 18 45 2> /tmp/inputbox.tmp.$$
@@ -405,7 +405,7 @@ done
 
 cat /tmp/jwmrc-tray-tmp-* >> /tmp/jwmrc-tray-1.txt
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Moving complete.
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/personal b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/personal
index 53cc8a6..4c935cb 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/personal
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/personal
@@ -10,9 +10,9 @@
 
 ##--------variables-------->>
 
-#SCRIPT_DIR="/root/.jwm"
+#SCRIPT_DIR="${HOME}/.jwm"
 SCRIPT_DIR="/usr/local/jwmconfig"
-#IMAGES_DIR="/root/.jwm/images"
+#IMAGES_DIR="${HOME}/.jwm/images"
 IMAGES_DIR="/usr/local/jwmconfig/images"
 MINI_ICONS_DIR="/usr/local/lib/X11/mini-icons"
 
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbar b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbar
index 6ab4f0b..da60361 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbar
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbar
@@ -3,9 +3,9 @@
 ##---taskbar config for jwmConfigMgr--->>
 
 ##-------variables------->>
-#SCRIPT_DIR="/root/.jwm"
+#SCRIPT_DIR="${HOME}/.jwm"
 SCRIPT_DIR="/usr/local/jwmconfig"
-#IMAGES_DIR="/root/.jwm/images"
+#IMAGES_DIR="${HOME}/.jwm/images"
 IMAGES_DIR="/usr/local/jwmconfig/images"
 MINI_ICONS_DIR="/usr/local/lib/X11/mini-icons"
 
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbarConfig b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbarConfig
index b809df3..1beea02 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbarConfig
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbarConfig
@@ -10,9 +10,9 @@
 TMP="/tmp/checklist.tmp.$$"
 ISSET="true"
 ISOFF="false"
-CONFIG="/root/.jwmrc-tray"
-CONFIG2="/root/.jwmrc-tray-bak"
-CONF="/root/.jwmrc-tray-temp"
+CONFIG="${HOME}/.jwmrc-tray"
+CONFIG2="${HOME}/.jwmrc-tray-bak"
+CONF="${HOME}/.jwmrc-tray-temp"
 
 #----Set defaults---->>
 AUTO_OFF=ON
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbarHeight b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbarHeight
index 1f24fd9..2bfe909 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbarHeight
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbarHeight
@@ -12,9 +12,9 @@ SHRT="18"
 NORM="26"
 TALL="34"
 XTTL="42"
-CONFIG="/root/.jwmrc-tray"
-CONFIG2="/root/.jwmrc-tray-bak"
-CONF="/root/.jwmrc-tray-temp"
+CONFIG="${HOME}/.jwmrc-tray"
+CONFIG2="${HOME}/.jwmrc-tray-bak"
+CONF="${HOME}/.jwmrc-tray-temp"
 
 #----Set defaults---->>
 IS_SHRT=off
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbarPlace b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbarPlace
index 8087894..a4e1e4c 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbarPlace
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/taskbarPlace
@@ -10,9 +10,9 @@
 TMP="/tmp/checklist.tmp.$$"
 TOP="0"
 BTM="-1"
-CONFIG="/root/.jwmrc-tray"
-CONFIG2="/root/.jwmrc-tray-bak"
-CONF="/root/.jwmrc-tray-temp"
+CONFIG="${HOME}/.jwmrc-tray"
+CONFIG2="${HOME}/.jwmrc-tray-bak"
+CONF="${HOME}/.jwmrc-tray-temp"
 
 #----Set defaults---->>
 AT_BTM=ON
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/trayInsert b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/trayInsert
index 0c5bf29..2bcfc4d 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/trayInsert
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/trayInsert
@@ -20,9 +20,9 @@
 ##-----taskbarConfig----->>
 
 TMP="/tmp/checklist.tmp.$$"
-CONFIG="/root/.jwm/jwmrc-personal"
-CONFIG2="/root/.jwm/jwmrc-personal-bak"
-CONF="/root/.jwm/jwmrc-personal-temp"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONFIG2="${HOME}/.jwm/jwmrc-personal-bak"
+CONF="${HOME}/.jwm/jwmrc-personal-temp"
 DCL="<TaskListStyle insert=\"left\"/>"
 DCR="<TaskListStyle insert=\"right\"/>"
 DCO="<TaskListStyle insert="
diff --git a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/virtualDesk b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/virtualDesk
index cbfe717..2fc6225 100755
--- a/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/virtualDesk
+++ b/puppy-unleashed/packages/jwmconfig-18jan08/usr/local/jwmconfig/virtualDesk
@@ -9,9 +9,9 @@
 MINTOPS=1
 MAXTOPS=8
 DC="<Desktops count=\"[0-9][0-9]*\"/>"
-CONFIG="/root/.jwm/jwmrc-personal"
-CONFIG2="/root/.jwm/jwmrc-personal-bak"
-CONF="/root/.jwm/jwmrc-personal-temp"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONFIG2="${HOME}/.jwm/jwmrc-personal-bak"
+CONF="${HOME}/.jwm/jwmrc-personal-temp"
 TMP="/tmp/inputbox.tmp.$$"
 
 #-----Backup current settings----->>
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/addShortcut b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/addShortcut
index e1f1ce1..39fa002 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/addShortcut
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/addShortcut
@@ -19,8 +19,8 @@ TMP1="/tmp/addmask.tmp.$$"
 TMP2="/tmp/maskkey.tmp.$$"
 MASKKEY=
 INSERT=/bindings/a\ 
-CONF_FILE=/root/.jwm/jwmrc-personal
-CONF_FILE2=/root/.jwm/jwmrc-personal2
+CONF_FILE=${HOME}/.jwm/jwmrc-personal
+CONF_FILE2=${HOME}/.jwm/jwmrc-personal2
 
 #-----------add shortcut------->
 
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/changeKey b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/changeKey
index 4d2a10f..93588ba 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/changeKey
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/changeKey
@@ -24,7 +24,7 @@ M=
 MASK=`echo $KEY | grep -c mask`
 A=
 TMPFILE="/tmp/shortcut"
-#SCRIPT_DIR="/root/.jwm"
+#SCRIPT_DIR="${HOME}/.jwm"
 SCRIPT_DIR="/usr/local/jwmconfig"
 ID=
 
@@ -59,7 +59,7 @@ fi
 
 echo res $RES
 
-KEYLINE=`grep "$RES" /root/.jwm/jwmrc-personal`
+KEYLINE=`grep "$RES" ${HOME}/.jwm/jwmrc-personal`
 
 #xmessage -name "Current Details" -nearmouse "Current shortcut details:  $KEYLINE" &
    echo $KEYLINE
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/confirmKey b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/confirmKey
index 618f2b7..6ee2784 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/confirmKey
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/confirmKey
@@ -24,8 +24,8 @@ OLD=
 OLDFILE="/tmp/short"
 CHANGE_SED=
 DEL_SED=
-CONF_FILE=/root/.jwm/jwmrc-personal
-CONF_FILE2=/root/.jwm/jwmrc-personal2
+CONF_FILE=${HOME}/.jwm/jwmrc-personal
+CONF_FILE2=${HOME}/.jwm/jwmrc-personal2
 TEST=
 
 ##------confirmation--------->>
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/focusModel b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/focusModel
index 428cd2f..ad89826 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/focusModel
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/focusModel
@@ -6,9 +6,9 @@
 
 CLICK='<FocusModel>click</FocusModel>'
 SLOPPY='<FocusModel>sloppy</FocusModel>'
-CONFIG="/root/.jwm/jwmrc-personal"
-CONF="/root/.jwm/jwmrc-personal-temp"
-CONF2="/root/.jwm/jwmrc-personal-temp2"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONF="${HOME}/.jwm/jwmrc-personal-temp"
+CONF2="${HOME}/.jwm/jwmrc-personal-temp2"
 TMP="/tmp/inputbox.tmp.$$"
 
 CHOICE=click
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/gtk2jwm b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/gtk2jwm
index bf786ee..414422e 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/gtk2jwm
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/gtk2jwm
@@ -19,10 +19,10 @@
 
 ##-------------variables---------------->>
 		
-GTKTHEME=`fgrep 'include' /root/.gtkrc-2.0 | fgrep '/usr/share/themes/' | grep -v '^#' | fgrep -m1 'gtkrc' | tr -d "'" | tr -d '"' | sed 's/include //' | tr -d '\t' | tr -d ' '`
+GTKTHEME=`fgrep 'include' ${HOME}/.gtkrc-2.0 | fgrep '/usr/share/themes/' | grep -v '^#' | fgrep -m1 'gtkrc' | tr -d "'" | tr -d '"' | sed 's/include //' | tr -d '\t' | tr -d ' '`
 [ ! -e $GTKTHEME ] && exit 1 
 
-JWMTHEME=/root/.jwm/jwmrc-theme
+JWMTHEME=${HOME}/.jwm/jwmrc-theme
 
 MENU_BG=
 ACTIVE_BG=
@@ -39,14 +39,14 @@ PAGER_BG=`grep -v "^#" $GTKTHEME | grep -m1 '\Wbg\[ACTIVE\]' | cut -d'"' -f2`
 FG_SELECTED=`grep -v "^#" $GTKTHEME | grep -m1 '\Wfg\[SELECTED\]' | cut -d'"' -f2`
 
 #save them...
-echo '#This is written to by /usr/local/jwmconfig2/gtk2jwm script' > /root/.jwm/jwm_colors
-echo "MENU_BG='${MENU_BG}'" >> /root/.jwm/jwm_colors
-echo "ACTIVE_BG='${ACTIVE_BG}'" >> /root/.jwm/jwm_colors
-echo "FOREGROUND='${FOREGROUND}'" >> /root/.jwm/jwm_colors
-echo "PAGER_BG='${PAGER_BG}'" >> /root/.jwm/jwm_colors
-echo "FG_SELECTED='${FG_SELECTED}'" >> /root/.jwm/jwm_colors
-
-rm -f /root/.tcl-gtk 
+echo '#This is written to by /usr/local/jwmconfig2/gtk2jwm script' > ${HOME}/.jwm/jwm_colors
+echo "MENU_BG='${MENU_BG}'" >> ${HOME}/.jwm/jwm_colors
+echo "ACTIVE_BG='${ACTIVE_BG}'" >> ${HOME}/.jwm/jwm_colors
+echo "FOREGROUND='${FOREGROUND}'" >> ${HOME}/.jwm/jwm_colors
+echo "PAGER_BG='${PAGER_BG}'" >> ${HOME}/.jwm/jwm_colors
+echo "FG_SELECTED='${FG_SELECTED}'" >> ${HOME}/.jwm/jwm_colors
+
+rm -f ${HOME}/.tcl-gtk 
 if [ -z "$MENU_BG" ]; then
  echo > "$JWMTHEME"
  pidof jwm >/dev/null && jwm -restart
@@ -54,11 +54,11 @@ if [ -z "$MENU_BG" ]; then
 else 
  # set variables for tcl/tk apps:
  ## need to make sure they're not blank
- [ "$MENU_BG" ] && echo  "bg_normal=$MENU_BG" >>/root/.tcl-gtk
- [ "$ACTIVE_BG" ] && echo  "bg_selected=$ACTIVE_BG" >>/root/.tcl-gtk
- [ "$PAGER_BG" ] && echo  "bg_active=$PAGER_BG" >>/root/.tcl-gtk
- [ "$FOREGROUND" ] && echo  "fg_normal=$FOREGROUND" >>/root/.tcl-gtk
- [ "$FG_SELECTED" ] && echo  "fg_selected=$FG_SELECTED" >>/root/.tcl-gtk
+ [ "$MENU_BG" ] && echo  "bg_normal=$MENU_BG" >>${HOME}/.tcl-gtk
+ [ "$ACTIVE_BG" ] && echo  "bg_selected=$ACTIVE_BG" >>${HOME}/.tcl-gtk
+ [ "$PAGER_BG" ] && echo  "bg_active=$PAGER_BG" >>${HOME}/.tcl-gtk
+ [ "$FOREGROUND" ] && echo  "fg_normal=$FOREGROUND" >>${HOME}/.tcl-gtk
+ [ "$FG_SELECTED" ] && echo  "fg_selected=$FG_SELECTED" >>${HOME}/.tcl-gtk
  
   # create gradient colours:
   DIFF="16#20"
@@ -153,8 +153,8 @@ echo "$DEFAULT" > "$JWMTHEME"
 
 #########
 #John Doe created code for the applet backgrounds, old jwmconfig, port here...
-TrayFile="/root/.jwmrc-tray"
-TrayFileBak="/root/.jwmrc-tray.bak"
+TrayFile="${HOME}/.jwmrc-tray"
+TrayFileBak="${HOME}/.jwmrc-tray.bak"
 
 BackgroundColor="$MENU_BG" #"#ffc100"
 
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/jwmConfigMgr b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/jwmConfigMgr
index 720ff19..c507b7d 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/jwmConfigMgr
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/jwmConfigMgr
@@ -5,7 +5,7 @@
 ##--------variables---------->>
 SCRIPT_DIR="/usr/local/jwmconfig2"
 MINI_ICONS_DIR="/usr/local/lib/X11/mini-icons"
-HOME_DIR="/root/.jwm"
+HOME_DIR="${HOME}/.jwm"
 echo "SCRIPT_DIR='${SCRIPT_DIR}'" > /tmp/JWMCONFIGVARS
 echo "MINI_ICONS_DIR='${MINI_ICONS_DIR}'" >> /tmp/JWMCONFIGVARS
 echo "HOME_DIR='${HOME_DIR}'" >> /tmp/JWMCONFIGVARS
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/listShortcuts b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/listShortcuts
index 75622a8..c468e33 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/listShortcuts
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/listShortcuts
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-HOME_DIR=/root/.jwm
+HOME_DIR=${HOME}/.jwm
 SCRIPT_DIR="/usr/local/jwmconfig"
 
 ##----lists shortcuts contained in the jwmrc-personal file---->>
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/panel-buttons b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/panel-buttons
index 20b681f..cc6a0e2 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/panel-buttons
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/panel-buttons
@@ -9,21 +9,21 @@
 #
 #####################################
 
-if [ "`ls /root/.jwmrc-tray-bak`" = "" ]; then
-cp /root/.jwmrc-tray /root/.jwmrc-tray-bak  ### makes .jwmrc-tray-bak backup file unless it already exists
+if [ "`ls ${HOME}/.jwmrc-tray-bak`" = "" ]; then
+cp ${HOME}/.jwmrc-tray ${HOME}/.jwmrc-tray-bak  ### makes .jwmrc-tray-bak backup file unless it already exists
 fi
-cat /root/.jwmrc-tray | sed '/^$/d' > /tmp/.jwmrc-tray  ### remove all blank lines in .jwmrc-tray
-mv /tmp/.jwmrc-tray /root/
+cat ${HOME}/.jwmrc-tray | sed '/^$/d' > /tmp/.jwmrc-tray  ### remove all blank lines in .jwmrc-tray
+mv /tmp/.jwmrc-tray ${HOME}/
 
-total=`wc -l /root/.jwmrc-tray | sed -e 's/ *//' | sed -e 's/ .*//g'` ### get total number of lines
-low=`grep '<TrayButton label="Menu"'  -n /root/.jwmrc-tray | sed -e 's/\:.*>//g'`  ### get line number with the Menu button
-high=`grep '<!-- Additional Pager attributes; width, height -->' -n /root/.jwmrc-tray | sed -e 's/\:.*>//g'` ### get line number with Additional Pager
+total=`wc -l ${HOME}/.jwmrc-tray | sed -e 's/ *//' | sed -e 's/ .*//g'` ### get total number of lines
+low=`grep '<TrayButton label="Menu"'  -n ${HOME}/.jwmrc-tray | sed -e 's/\:.*>//g'`  ### get line number with the Menu button
+high=`grep '<!-- Additional Pager attributes; width, height -->' -n ${HOME}/.jwmrc-tray | sed -e 's/\:.*>//g'` ### get line number with Additional Pager
 last=`echo "(("$total" - "$high" + 2))" | bc -l` 
 begin=`echo "(("$low" + 1))" | bc -l` ### first line with panel buttons
 #end=`echo "(("$high" - 1))" | bc -l` ### last line with panel buttons
 
-cat /root/.jwmrc-tray | head -n "$low" > /tmp/jwmrc-tray-1.txt
-cat /root/.jwmrc-tray | tail -n "$last" > /tmp/jwmrc-tray-3.txt
+cat ${HOME}/.jwmrc-tray | head -n "$low" > /tmp/jwmrc-tray-1.txt
+cat ${HOME}/.jwmrc-tray | tail -n "$last" > /tmp/jwmrc-tray-3.txt
 
 num=1
 
@@ -70,7 +70,7 @@ case $? in
     echo "Box closed.";;
 esac
 
-cp /root/.jwmrc-tray /root/.jwmrc-tray-bak
+cp ${HOME}/.jwmrc-tray ${HOME}/.jwmrc-tray-bak
 exit 0
 fi
 
@@ -82,11 +82,11 @@ if [ "$choice" = Edit ]; then
 
 while [ "$begin" != "$high" ]; do
 
-cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-popup.txt  ### gets popup text
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-popup.txt  ### gets popup text
 popup=`cat /tmp/tmp-popup.txt`
-cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e "s/$popup//" | sed -e 's/" icon="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-icon.txt  ### gets icon text
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e "s/$popup//" | sed -e 's/" icon="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-icon.txt  ### gets icon text
 icon=`cat /tmp/tmp-icon.txt`
-cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed 's/\<.*\"//g' | sed -e 's/<\/TrayButton>//' | sed -e 's/<>//' | sed 's/^[ \t]*//' > /tmp/tmp-exec.txt  ### gets executable text
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed 's/\<.*\"//g' | sed -e 's/<\/TrayButton>//' | sed -e 's/<>//' | sed 's/^[ \t]*//' > /tmp/tmp-exec.txt  ### gets executable text
 #action=`cat /tmp/tmp-exec.txt`
 
 ### This is the Edit gui
@@ -150,7 +150,7 @@ done
 
 cat /tmp/jwmrc-tray-2.txt >> /tmp/jwmrc-tray-1.txt
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 rm -f /tmp/jwmrc-tray-*
 rm -f /tmp/tmp-popup*.txt
@@ -173,7 +173,7 @@ fi
 
 if [ "$choice" = Restore ]; then
 
-mv /root/.jwmrc-tray-bak /root/.jwmrc-tray
+mv ${HOME}/.jwmrc-tray-bak ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Your original .jwmrc-tray
@@ -191,7 +191,7 @@ fi
 
 if [ "$choice" = Add ]; then
 while [ "$begin" != "$high" ]; do
-cat /root/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel.txt
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel.txt
 begin=`echo "(("$begin" + 1))" | bc -l`
 shift
 done
@@ -246,7 +246,7 @@ echo "$new_line" >> /tmp/jwmrc-tray-panel.txt
 
 cat /tmp/jwmrc-tray-panel.txt >> /tmp/jwmrc-tray-1.txt
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Adding complete.
@@ -278,7 +278,7 @@ while [ "$begin" != "$high" ]; do
 
 Xdialog --backtitle "Remove panel buttons" \
 	--title "RADIOLIST BOX" \
-        --radiolist "Would you like to delete `cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'`\n\
+        --radiolist "Would you like to delete `cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'`\n\
 from the panel? If you want to delete it choose\n\
 yes, otherwise choose no." 26 46 5 \
         "no"    "no do not delete this button" ON \
@@ -298,7 +298,7 @@ case $retval in
 esac
 
 if [ "$choice" = no ]; then
-cat /root/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-1.txt
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-1.txt
 fi
 begin=`echo "(("$begin" + 1))" | bc -l`
 y=`echo "(("$y" + 1))" | bc -l`
@@ -307,7 +307,7 @@ shift
 done
 
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Removing complete.
@@ -327,10 +327,10 @@ if [ "$choice" = Move ]; then
 y=1
 z=`echo "(("$high" - "$begin"))" | bc -l`
 while [ "$begin" != "$high" ]; do
-cat /root/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel-"$y".txt
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel-"$y".txt
 
 Xdialog --title "INPUT BOX" \
-        --inputbox "`cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'` is button $y of your $z buttons.\n\
+        --inputbox "`cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'` is button $y of your $z buttons.\n\
 \n\
 If you would like that button in another\n\
 position please enter the number below." 18 45 2> /tmp/inputbox.tmp.$$
@@ -405,7 +405,7 @@ done
 
 cat /tmp/jwmrc-tray-tmp-* >> /tmp/jwmrc-tray-1.txt
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Moving complete.
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/taskbarConfig b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/taskbarConfig
index b809df3..1beea02 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/taskbarConfig
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/taskbarConfig
@@ -10,9 +10,9 @@
 TMP="/tmp/checklist.tmp.$$"
 ISSET="true"
 ISOFF="false"
-CONFIG="/root/.jwmrc-tray"
-CONFIG2="/root/.jwmrc-tray-bak"
-CONF="/root/.jwmrc-tray-temp"
+CONFIG="${HOME}/.jwmrc-tray"
+CONFIG2="${HOME}/.jwmrc-tray-bak"
+CONF="${HOME}/.jwmrc-tray-temp"
 
 #----Set defaults---->>
 AUTO_OFF=ON
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/taskbarHeight b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/taskbarHeight
index 17ae2a7..583db8b 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/taskbarHeight
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/taskbarHeight
@@ -13,9 +13,9 @@ SHRT="20"
 NORM="28"
 TALL="34"
 XTTL="42"
-CONFIG="/root/.jwmrc-tray"
-CONFIG2="/root/.jwmrc-tray-bak"
-CONF="/root/.jwmrc-tray-temp"
+CONFIG="${HOME}/.jwmrc-tray"
+CONFIG2="${HOME}/.jwmrc-tray-bak"
+CONF="${HOME}/.jwmrc-tray-temp"
 
 #----Set defaults---->>
 IS_SHRT=off
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/taskbarPlace b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/taskbarPlace
index 8087894..a4e1e4c 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/taskbarPlace
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/taskbarPlace
@@ -10,9 +10,9 @@
 TMP="/tmp/checklist.tmp.$$"
 TOP="0"
 BTM="-1"
-CONFIG="/root/.jwmrc-tray"
-CONFIG2="/root/.jwmrc-tray-bak"
-CONF="/root/.jwmrc-tray-temp"
+CONFIG="${HOME}/.jwmrc-tray"
+CONFIG2="${HOME}/.jwmrc-tray-bak"
+CONF="${HOME}/.jwmrc-tray-temp"
 
 #----Set defaults---->>
 AT_BTM=ON
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/theme_switcher b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/theme_switcher
index 0ad831a..539ad47 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/theme_switcher
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/theme_switcher
@@ -6,13 +6,13 @@
 #  <text><label>\"${CHARPAD}\"</label></text>
 
 ICONSETSGUI=""
-for ONETHEME in `find /root/.jwm/themes/ -mindepth 1 -maxdepth 1 -type f | grep 'jwmrc' | sed -e 's/-jwmrc//' | tr '\n' ' '`
+for ONETHEME in `find ${HOME}/.jwm/themes/ -mindepth 1 -maxdepth 1 -type f | grep 'jwmrc' | sed -e 's/-jwmrc//' | tr '\n' ' '`
 do
  ONETHEME="`basename $ONETHEME`"
  ICONSETSGUI="$ICONSETSGUI
  <hbox>
-  <pixmap><input file>/root/.jwm/themes/${ONETHEME}-tray.png</input></pixmap>
-  <pixmap><input file>/root/.jwm/themes/${ONETHEME}-window.png</input></pixmap>
+  <pixmap><input file>${HOME}/.jwm/themes/${ONETHEME}-tray.png</input></pixmap>
+  <pixmap><input file>${HOME}/.jwm/themes/${ONETHEME}-window.png</input></pixmap>
   <vbox>
    <pixmap><input file>/usr/local/lib/X11/pixmaps/invisible96x8.png</input></pixmap>
    <button><label>${ONETHEME}</label></button>
@@ -43,22 +43,22 @@ eval "$RETSTUFF"
 
 NEWTHEME="$EXIT"
 [ "$NEWTHEME" = "" ] && exit
-[ ! -f /root/.jwm/themes/${NEWTHEME}-jwmrc ] && exit
+[ ! -f ${HOME}/.jwm/themes/${NEWTHEME}-jwmrc ] && exit
 
 if [ "$NEWTHEME" != "" ];then
  #select chosen theme...
- cp -f /root/.jwm/themes/${NEWTHEME}-jwmrc /root/.jwm/jwmrc-theme
+ cp -f ${HOME}/.jwm/themes/${NEWTHEME}-jwmrc ${HOME}/.jwm/jwmrc-theme
  #set correct backgrounds for applets...
- cp -f /root/.jwm/themes/${NEWTHEME}-colors /root/.jwm/jwm_colors
- #...note, /root/.xinitrc reads this file to set background for absvolume.
+ cp -f ${HOME}/.jwm/themes/${NEWTHEME}-colors ${HOME}/.jwm/jwm_colors
+ #...note, ${HOME}/.xinitrc reads this file to set background for absvolume.
  #...note, jwm_colors is written to by /usr/local/jwmconfig2/gtk2jwm script
 
-. /root/.jwm/jwm_colors #gives MENU_BG, PAGER_BG
+. ${HOME}/.jwm/jwm_colors #gives MENU_BG, PAGER_BG
 
  #########
  #John Doe created code for the applet backgrounds, old jwmconfig, port here...
- TrayFile="/root/.jwmrc-tray"
- TrayFileBak="/root/.jwmrc-tray.bak"
+ TrayFile="${HOME}/.jwmrc-tray"
+ TrayFileBak="${HOME}/.jwmrc-tray.bak"
 
  BackgroundColor="$MENU_BG" #"#ffc100"
  [ "$BackgroundColor" = "" ] && BackgroundColor='#ffc100'
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/trayInsert b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/trayInsert
index 0c5bf29..2bcfc4d 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/trayInsert
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/trayInsert
@@ -20,9 +20,9 @@
 ##-----taskbarConfig----->>
 
 TMP="/tmp/checklist.tmp.$$"
-CONFIG="/root/.jwm/jwmrc-personal"
-CONFIG2="/root/.jwm/jwmrc-personal-bak"
-CONF="/root/.jwm/jwmrc-personal-temp"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONFIG2="${HOME}/.jwm/jwmrc-personal-bak"
+CONF="${HOME}/.jwm/jwmrc-personal-temp"
 DCL="<TaskListStyle insert=\"left\"/>"
 DCR="<TaskListStyle insert=\"right\"/>"
 DCO="<TaskListStyle insert="
diff --git a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/virtualDesk b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/virtualDesk
index cbfe717..2fc6225 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/virtualDesk
+++ b/puppy-unleashed/packages/jwmconfig2-20080411/usr/local/jwmconfig2/virtualDesk
@@ -9,9 +9,9 @@
 MINTOPS=1
 MAXTOPS=8
 DC="<Desktops count=\"[0-9][0-9]*\"/>"
-CONFIG="/root/.jwm/jwmrc-personal"
-CONFIG2="/root/.jwm/jwmrc-personal-bak"
-CONF="/root/.jwm/jwmrc-personal-temp"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONFIG2="${HOME}/.jwm/jwmrc-personal-bak"
+CONF="${HOME}/.jwm/jwmrc-personal-temp"
 TMP="/tmp/inputbox.tmp.$$"
 
 #-----Backup current settings----->>
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/addShortcut b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/addShortcut
index e1f1ce1..39fa002 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/addShortcut
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/addShortcut
@@ -19,8 +19,8 @@ TMP1="/tmp/addmask.tmp.$$"
 TMP2="/tmp/maskkey.tmp.$$"
 MASKKEY=
 INSERT=/bindings/a\ 
-CONF_FILE=/root/.jwm/jwmrc-personal
-CONF_FILE2=/root/.jwm/jwmrc-personal2
+CONF_FILE=${HOME}/.jwm/jwmrc-personal
+CONF_FILE2=${HOME}/.jwm/jwmrc-personal2
 
 #-----------add shortcut------->
 
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/changeKey b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/changeKey
index 4d2a10f..93588ba 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/changeKey
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/changeKey
@@ -24,7 +24,7 @@ M=
 MASK=`echo $KEY | grep -c mask`
 A=
 TMPFILE="/tmp/shortcut"
-#SCRIPT_DIR="/root/.jwm"
+#SCRIPT_DIR="${HOME}/.jwm"
 SCRIPT_DIR="/usr/local/jwmconfig"
 ID=
 
@@ -59,7 +59,7 @@ fi
 
 echo res $RES
 
-KEYLINE=`grep "$RES" /root/.jwm/jwmrc-personal`
+KEYLINE=`grep "$RES" ${HOME}/.jwm/jwmrc-personal`
 
 #xmessage -name "Current Details" -nearmouse "Current shortcut details:  $KEYLINE" &
    echo $KEYLINE
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/confirmKey b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/confirmKey
index 618f2b7..6ee2784 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/confirmKey
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/confirmKey
@@ -24,8 +24,8 @@ OLD=
 OLDFILE="/tmp/short"
 CHANGE_SED=
 DEL_SED=
-CONF_FILE=/root/.jwm/jwmrc-personal
-CONF_FILE2=/root/.jwm/jwmrc-personal2
+CONF_FILE=${HOME}/.jwm/jwmrc-personal
+CONF_FILE2=${HOME}/.jwm/jwmrc-personal2
 TEST=
 
 ##------confirmation--------->>
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/focusModel b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/focusModel
index 428cd2f..ad89826 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/focusModel
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/focusModel
@@ -6,9 +6,9 @@
 
 CLICK='<FocusModel>click</FocusModel>'
 SLOPPY='<FocusModel>sloppy</FocusModel>'
-CONFIG="/root/.jwm/jwmrc-personal"
-CONF="/root/.jwm/jwmrc-personal-temp"
-CONF2="/root/.jwm/jwmrc-personal-temp2"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONF="${HOME}/.jwm/jwmrc-personal-temp"
+CONF2="${HOME}/.jwm/jwmrc-personal-temp2"
 TMP="/tmp/inputbox.tmp.$$"
 
 CHOICE=click
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/gtk2jwm b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/gtk2jwm
index bf786ee..414422e 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/gtk2jwm
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/gtk2jwm
@@ -19,10 +19,10 @@
 
 ##-------------variables---------------->>
 		
-GTKTHEME=`fgrep 'include' /root/.gtkrc-2.0 | fgrep '/usr/share/themes/' | grep -v '^#' | fgrep -m1 'gtkrc' | tr -d "'" | tr -d '"' | sed 's/include //' | tr -d '\t' | tr -d ' '`
+GTKTHEME=`fgrep 'include' ${HOME}/.gtkrc-2.0 | fgrep '/usr/share/themes/' | grep -v '^#' | fgrep -m1 'gtkrc' | tr -d "'" | tr -d '"' | sed 's/include //' | tr -d '\t' | tr -d ' '`
 [ ! -e $GTKTHEME ] && exit 1 
 
-JWMTHEME=/root/.jwm/jwmrc-theme
+JWMTHEME=${HOME}/.jwm/jwmrc-theme
 
 MENU_BG=
 ACTIVE_BG=
@@ -39,14 +39,14 @@ PAGER_BG=`grep -v "^#" $GTKTHEME | grep -m1 '\Wbg\[ACTIVE\]' | cut -d'"' -f2`
 FG_SELECTED=`grep -v "^#" $GTKTHEME | grep -m1 '\Wfg\[SELECTED\]' | cut -d'"' -f2`
 
 #save them...
-echo '#This is written to by /usr/local/jwmconfig2/gtk2jwm script' > /root/.jwm/jwm_colors
-echo "MENU_BG='${MENU_BG}'" >> /root/.jwm/jwm_colors
-echo "ACTIVE_BG='${ACTIVE_BG}'" >> /root/.jwm/jwm_colors
-echo "FOREGROUND='${FOREGROUND}'" >> /root/.jwm/jwm_colors
-echo "PAGER_BG='${PAGER_BG}'" >> /root/.jwm/jwm_colors
-echo "FG_SELECTED='${FG_SELECTED}'" >> /root/.jwm/jwm_colors
-
-rm -f /root/.tcl-gtk 
+echo '#This is written to by /usr/local/jwmconfig2/gtk2jwm script' > ${HOME}/.jwm/jwm_colors
+echo "MENU_BG='${MENU_BG}'" >> ${HOME}/.jwm/jwm_colors
+echo "ACTIVE_BG='${ACTIVE_BG}'" >> ${HOME}/.jwm/jwm_colors
+echo "FOREGROUND='${FOREGROUND}'" >> ${HOME}/.jwm/jwm_colors
+echo "PAGER_BG='${PAGER_BG}'" >> ${HOME}/.jwm/jwm_colors
+echo "FG_SELECTED='${FG_SELECTED}'" >> ${HOME}/.jwm/jwm_colors
+
+rm -f ${HOME}/.tcl-gtk 
 if [ -z "$MENU_BG" ]; then
  echo > "$JWMTHEME"
  pidof jwm >/dev/null && jwm -restart
@@ -54,11 +54,11 @@ if [ -z "$MENU_BG" ]; then
 else 
  # set variables for tcl/tk apps:
  ## need to make sure they're not blank
- [ "$MENU_BG" ] && echo  "bg_normal=$MENU_BG" >>/root/.tcl-gtk
- [ "$ACTIVE_BG" ] && echo  "bg_selected=$ACTIVE_BG" >>/root/.tcl-gtk
- [ "$PAGER_BG" ] && echo  "bg_active=$PAGER_BG" >>/root/.tcl-gtk
- [ "$FOREGROUND" ] && echo  "fg_normal=$FOREGROUND" >>/root/.tcl-gtk
- [ "$FG_SELECTED" ] && echo  "fg_selected=$FG_SELECTED" >>/root/.tcl-gtk
+ [ "$MENU_BG" ] && echo  "bg_normal=$MENU_BG" >>${HOME}/.tcl-gtk
+ [ "$ACTIVE_BG" ] && echo  "bg_selected=$ACTIVE_BG" >>${HOME}/.tcl-gtk
+ [ "$PAGER_BG" ] && echo  "bg_active=$PAGER_BG" >>${HOME}/.tcl-gtk
+ [ "$FOREGROUND" ] && echo  "fg_normal=$FOREGROUND" >>${HOME}/.tcl-gtk
+ [ "$FG_SELECTED" ] && echo  "fg_selected=$FG_SELECTED" >>${HOME}/.tcl-gtk
  
   # create gradient colours:
   DIFF="16#20"
@@ -153,8 +153,8 @@ echo "$DEFAULT" > "$JWMTHEME"
 
 #########
 #John Doe created code for the applet backgrounds, old jwmconfig, port here...
-TrayFile="/root/.jwmrc-tray"
-TrayFileBak="/root/.jwmrc-tray.bak"
+TrayFile="${HOME}/.jwmrc-tray"
+TrayFileBak="${HOME}/.jwmrc-tray.bak"
 
 BackgroundColor="$MENU_BG" #"#ffc100"
 
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/jwmConfigMgr b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/jwmConfigMgr
index 720ff19..c507b7d 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/jwmConfigMgr
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/jwmConfigMgr
@@ -5,7 +5,7 @@
 ##--------variables---------->>
 SCRIPT_DIR="/usr/local/jwmconfig2"
 MINI_ICONS_DIR="/usr/local/lib/X11/mini-icons"
-HOME_DIR="/root/.jwm"
+HOME_DIR="${HOME}/.jwm"
 echo "SCRIPT_DIR='${SCRIPT_DIR}'" > /tmp/JWMCONFIGVARS
 echo "MINI_ICONS_DIR='${MINI_ICONS_DIR}'" >> /tmp/JWMCONFIGVARS
 echo "HOME_DIR='${HOME_DIR}'" >> /tmp/JWMCONFIGVARS
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/listShortcuts b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/listShortcuts
index 75622a8..c468e33 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/listShortcuts
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/listShortcuts
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-HOME_DIR=/root/.jwm
+HOME_DIR=${HOME}/.jwm
 SCRIPT_DIR="/usr/local/jwmconfig"
 
 ##----lists shortcuts contained in the jwmrc-personal file---->>
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/panel-buttons b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/panel-buttons
index 20b681f..cc6a0e2 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/panel-buttons
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/panel-buttons
@@ -9,21 +9,21 @@
 #
 #####################################
 
-if [ "`ls /root/.jwmrc-tray-bak`" = "" ]; then
-cp /root/.jwmrc-tray /root/.jwmrc-tray-bak  ### makes .jwmrc-tray-bak backup file unless it already exists
+if [ "`ls ${HOME}/.jwmrc-tray-bak`" = "" ]; then
+cp ${HOME}/.jwmrc-tray ${HOME}/.jwmrc-tray-bak  ### makes .jwmrc-tray-bak backup file unless it already exists
 fi
-cat /root/.jwmrc-tray | sed '/^$/d' > /tmp/.jwmrc-tray  ### remove all blank lines in .jwmrc-tray
-mv /tmp/.jwmrc-tray /root/
+cat ${HOME}/.jwmrc-tray | sed '/^$/d' > /tmp/.jwmrc-tray  ### remove all blank lines in .jwmrc-tray
+mv /tmp/.jwmrc-tray ${HOME}/
 
-total=`wc -l /root/.jwmrc-tray | sed -e 's/ *//' | sed -e 's/ .*//g'` ### get total number of lines
-low=`grep '<TrayButton label="Menu"'  -n /root/.jwmrc-tray | sed -e 's/\:.*>//g'`  ### get line number with the Menu button
-high=`grep '<!-- Additional Pager attributes; width, height -->' -n /root/.jwmrc-tray | sed -e 's/\:.*>//g'` ### get line number with Additional Pager
+total=`wc -l ${HOME}/.jwmrc-tray | sed -e 's/ *//' | sed -e 's/ .*//g'` ### get total number of lines
+low=`grep '<TrayButton label="Menu"'  -n ${HOME}/.jwmrc-tray | sed -e 's/\:.*>//g'`  ### get line number with the Menu button
+high=`grep '<!-- Additional Pager attributes; width, height -->' -n ${HOME}/.jwmrc-tray | sed -e 's/\:.*>//g'` ### get line number with Additional Pager
 last=`echo "(("$total" - "$high" + 2))" | bc -l` 
 begin=`echo "(("$low" + 1))" | bc -l` ### first line with panel buttons
 #end=`echo "(("$high" - 1))" | bc -l` ### last line with panel buttons
 
-cat /root/.jwmrc-tray | head -n "$low" > /tmp/jwmrc-tray-1.txt
-cat /root/.jwmrc-tray | tail -n "$last" > /tmp/jwmrc-tray-3.txt
+cat ${HOME}/.jwmrc-tray | head -n "$low" > /tmp/jwmrc-tray-1.txt
+cat ${HOME}/.jwmrc-tray | tail -n "$last" > /tmp/jwmrc-tray-3.txt
 
 num=1
 
@@ -70,7 +70,7 @@ case $? in
     echo "Box closed.";;
 esac
 
-cp /root/.jwmrc-tray /root/.jwmrc-tray-bak
+cp ${HOME}/.jwmrc-tray ${HOME}/.jwmrc-tray-bak
 exit 0
 fi
 
@@ -82,11 +82,11 @@ if [ "$choice" = Edit ]; then
 
 while [ "$begin" != "$high" ]; do
 
-cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-popup.txt  ### gets popup text
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-popup.txt  ### gets popup text
 popup=`cat /tmp/tmp-popup.txt`
-cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e "s/$popup//" | sed -e 's/" icon="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-icon.txt  ### gets icon text
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e "s/$popup//" | sed -e 's/" icon="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-icon.txt  ### gets icon text
 icon=`cat /tmp/tmp-icon.txt`
-cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed 's/\<.*\"//g' | sed -e 's/<\/TrayButton>//' | sed -e 's/<>//' | sed 's/^[ \t]*//' > /tmp/tmp-exec.txt  ### gets executable text
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed 's/\<.*\"//g' | sed -e 's/<\/TrayButton>//' | sed -e 's/<>//' | sed 's/^[ \t]*//' > /tmp/tmp-exec.txt  ### gets executable text
 #action=`cat /tmp/tmp-exec.txt`
 
 ### This is the Edit gui
@@ -150,7 +150,7 @@ done
 
 cat /tmp/jwmrc-tray-2.txt >> /tmp/jwmrc-tray-1.txt
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 rm -f /tmp/jwmrc-tray-*
 rm -f /tmp/tmp-popup*.txt
@@ -173,7 +173,7 @@ fi
 
 if [ "$choice" = Restore ]; then
 
-mv /root/.jwmrc-tray-bak /root/.jwmrc-tray
+mv ${HOME}/.jwmrc-tray-bak ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Your original .jwmrc-tray
@@ -191,7 +191,7 @@ fi
 
 if [ "$choice" = Add ]; then
 while [ "$begin" != "$high" ]; do
-cat /root/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel.txt
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel.txt
 begin=`echo "(("$begin" + 1))" | bc -l`
 shift
 done
@@ -246,7 +246,7 @@ echo "$new_line" >> /tmp/jwmrc-tray-panel.txt
 
 cat /tmp/jwmrc-tray-panel.txt >> /tmp/jwmrc-tray-1.txt
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Adding complete.
@@ -278,7 +278,7 @@ while [ "$begin" != "$high" ]; do
 
 Xdialog --backtitle "Remove panel buttons" \
 	--title "RADIOLIST BOX" \
-        --radiolist "Would you like to delete `cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'`\n\
+        --radiolist "Would you like to delete `cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'`\n\
 from the panel? If you want to delete it choose\n\
 yes, otherwise choose no." 26 46 5 \
         "no"    "no do not delete this button" ON \
@@ -298,7 +298,7 @@ case $retval in
 esac
 
 if [ "$choice" = no ]; then
-cat /root/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-1.txt
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-1.txt
 fi
 begin=`echo "(("$begin" + 1))" | bc -l`
 y=`echo "(("$y" + 1))" | bc -l`
@@ -307,7 +307,7 @@ shift
 done
 
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Removing complete.
@@ -327,10 +327,10 @@ if [ "$choice" = Move ]; then
 y=1
 z=`echo "(("$high" - "$begin"))" | bc -l`
 while [ "$begin" != "$high" ]; do
-cat /root/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel-"$y".txt
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel-"$y".txt
 
 Xdialog --title "INPUT BOX" \
-        --inputbox "`cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'` is button $y of your $z buttons.\n\
+        --inputbox "`cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'` is button $y of your $z buttons.\n\
 \n\
 If you would like that button in another\n\
 position please enter the number below." 18 45 2> /tmp/inputbox.tmp.$$
@@ -405,7 +405,7 @@ done
 
 cat /tmp/jwmrc-tray-tmp-* >> /tmp/jwmrc-tray-1.txt
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Moving complete.
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/taskbarConfig b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/taskbarConfig
index b809df3..1beea02 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/taskbarConfig
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/taskbarConfig
@@ -10,9 +10,9 @@
 TMP="/tmp/checklist.tmp.$$"
 ISSET="true"
 ISOFF="false"
-CONFIG="/root/.jwmrc-tray"
-CONFIG2="/root/.jwmrc-tray-bak"
-CONF="/root/.jwmrc-tray-temp"
+CONFIG="${HOME}/.jwmrc-tray"
+CONFIG2="${HOME}/.jwmrc-tray-bak"
+CONF="${HOME}/.jwmrc-tray-temp"
 
 #----Set defaults---->>
 AUTO_OFF=ON
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/taskbarHeight b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/taskbarHeight
index 17ae2a7..583db8b 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/taskbarHeight
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/taskbarHeight
@@ -13,9 +13,9 @@ SHRT="20"
 NORM="28"
 TALL="34"
 XTTL="42"
-CONFIG="/root/.jwmrc-tray"
-CONFIG2="/root/.jwmrc-tray-bak"
-CONF="/root/.jwmrc-tray-temp"
+CONFIG="${HOME}/.jwmrc-tray"
+CONFIG2="${HOME}/.jwmrc-tray-bak"
+CONF="${HOME}/.jwmrc-tray-temp"
 
 #----Set defaults---->>
 IS_SHRT=off
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/taskbarPlace b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/taskbarPlace
index 8087894..a4e1e4c 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/taskbarPlace
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/taskbarPlace
@@ -10,9 +10,9 @@
 TMP="/tmp/checklist.tmp.$$"
 TOP="0"
 BTM="-1"
-CONFIG="/root/.jwmrc-tray"
-CONFIG2="/root/.jwmrc-tray-bak"
-CONF="/root/.jwmrc-tray-temp"
+CONFIG="${HOME}/.jwmrc-tray"
+CONFIG2="${HOME}/.jwmrc-tray-bak"
+CONF="${HOME}/.jwmrc-tray-temp"
 
 #----Set defaults---->>
 AT_BTM=ON
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/theme_switcher b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/theme_switcher
index 93dbeab..70c51b6 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/theme_switcher
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/theme_switcher
@@ -6,13 +6,13 @@
 #  <text><label>\"${CHARPAD}\"</label></text>
 
 ICONSETSGUI=""
-for ONETHEME in `find /root/.jwm/themes/ -mindepth 1 -maxdepth 1 -type f | grep 'jwmrc' | sed -e 's/-jwmrc//' | tr '\n' ' '`
+for ONETHEME in `find ${HOME}/.jwm/themes/ -mindepth 1 -maxdepth 1 -type f | grep 'jwmrc' | sed -e 's/-jwmrc//' | tr '\n' ' '`
 do
  ONETHEME="`basename $ONETHEME`"
  ICONSETSGUI="$ICONSETSGUI
  <hbox>
-  <pixmap><input file>/root/.jwm/themes/${ONETHEME}-tray.png</input></pixmap>
-  <pixmap><input file>/root/.jwm/themes/${ONETHEME}-window.png</input></pixmap>
+  <pixmap><input file>${HOME}/.jwm/themes/${ONETHEME}-tray.png</input></pixmap>
+  <pixmap><input file>${HOME}/.jwm/themes/${ONETHEME}-window.png</input></pixmap>
   <vbox>
    <pixmap><input file>/usr/local/lib/X11/pixmaps/invisible96x8.png</input></pixmap>
    <button><label>${ONETHEME}</label></button>
@@ -43,22 +43,22 @@ eval "$RETSTUFF"
 
 NEWTHEME="$EXIT"
 [ "$NEWTHEME" = "" ] && exit
-[ ! -f /root/.jwm/themes/${NEWTHEME}-jwmrc ] && exit
+[ ! -f ${HOME}/.jwm/themes/${NEWTHEME}-jwmrc ] && exit
 
 if [ "$NEWTHEME" != "" ];then
  #select chosen theme...
- cp -f /root/.jwm/themes/${NEWTHEME}-jwmrc /root/.jwm/jwmrc-theme
+ cp -f ${HOME}/.jwm/themes/${NEWTHEME}-jwmrc ${HOME}/.jwm/jwmrc-theme
  #set correct backgrounds for applets...
- cp -f /root/.jwm/themes/${NEWTHEME}-colors /root/.jwm/jwm_colors
- #...note, /root/.xinitrc reads this file to set background for absvolume.
+ cp -f ${HOME}/.jwm/themes/${NEWTHEME}-colors ${HOME}/.jwm/jwm_colors
+ #...note, ${HOME}/.xinitrc reads this file to set background for absvolume.
  #...note, jwm_colors is written to by /usr/local/jwmconfig2/gtk2jwm script
 
-. /root/.jwm/jwm_colors #gives MENU_BG, PAGER_BG
+. ${HOME}/.jwm/jwm_colors #gives MENU_BG, PAGER_BG
 
  #########
  #John Doe created code for the applet backgrounds, old jwmconfig, port here...
- TrayFile="/root/.jwmrc-tray"
- TrayFileBak="/root/.jwmrc-tray.bak"
+ TrayFile="${HOME}/.jwmrc-tray"
+ TrayFileBak="${HOME}/.jwmrc-tray.bak"
 
  BackgroundColor="$MENU_BG" #"#ffc100"
  [ "$BackgroundColor" = "" ] && BackgroundColor='#ffc100'
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/trayInsert b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/trayInsert
index 0c5bf29..2bcfc4d 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/trayInsert
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/trayInsert
@@ -20,9 +20,9 @@
 ##-----taskbarConfig----->>
 
 TMP="/tmp/checklist.tmp.$$"
-CONFIG="/root/.jwm/jwmrc-personal"
-CONFIG2="/root/.jwm/jwmrc-personal-bak"
-CONF="/root/.jwm/jwmrc-personal-temp"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONFIG2="${HOME}/.jwm/jwmrc-personal-bak"
+CONF="${HOME}/.jwm/jwmrc-personal-temp"
 DCL="<TaskListStyle insert=\"left\"/>"
 DCR="<TaskListStyle insert=\"right\"/>"
 DCO="<TaskListStyle insert="
diff --git a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/virtualDesk b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/virtualDesk
index cbfe717..2fc6225 100755
--- a/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/virtualDesk
+++ b/puppy-unleashed/packages/jwmconfig2-20080729/usr/local/jwmconfig2/virtualDesk
@@ -9,9 +9,9 @@
 MINTOPS=1
 MAXTOPS=8
 DC="<Desktops count=\"[0-9][0-9]*\"/>"
-CONFIG="/root/.jwm/jwmrc-personal"
-CONFIG2="/root/.jwm/jwmrc-personal-bak"
-CONF="/root/.jwm/jwmrc-personal-temp"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONFIG2="${HOME}/.jwm/jwmrc-personal-bak"
+CONF="${HOME}/.jwm/jwmrc-personal-temp"
 TMP="/tmp/inputbox.tmp.$$"
 
 #-----Backup current settings----->>
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/addShortcut b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/addShortcut
index e1f1ce1..39fa002 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/addShortcut
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/addShortcut
@@ -19,8 +19,8 @@ TMP1="/tmp/addmask.tmp.$$"
 TMP2="/tmp/maskkey.tmp.$$"
 MASKKEY=
 INSERT=/bindings/a\ 
-CONF_FILE=/root/.jwm/jwmrc-personal
-CONF_FILE2=/root/.jwm/jwmrc-personal2
+CONF_FILE=${HOME}/.jwm/jwmrc-personal
+CONF_FILE2=${HOME}/.jwm/jwmrc-personal2
 
 #-----------add shortcut------->
 
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/changeKey b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/changeKey
index 4d2a10f..93588ba 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/changeKey
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/changeKey
@@ -24,7 +24,7 @@ M=
 MASK=`echo $KEY | grep -c mask`
 A=
 TMPFILE="/tmp/shortcut"
-#SCRIPT_DIR="/root/.jwm"
+#SCRIPT_DIR="${HOME}/.jwm"
 SCRIPT_DIR="/usr/local/jwmconfig"
 ID=
 
@@ -59,7 +59,7 @@ fi
 
 echo res $RES
 
-KEYLINE=`grep "$RES" /root/.jwm/jwmrc-personal`
+KEYLINE=`grep "$RES" ${HOME}/.jwm/jwmrc-personal`
 
 #xmessage -name "Current Details" -nearmouse "Current shortcut details:  $KEYLINE" &
    echo $KEYLINE
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/confirmKey b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/confirmKey
index 618f2b7..6ee2784 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/confirmKey
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/confirmKey
@@ -24,8 +24,8 @@ OLD=
 OLDFILE="/tmp/short"
 CHANGE_SED=
 DEL_SED=
-CONF_FILE=/root/.jwm/jwmrc-personal
-CONF_FILE2=/root/.jwm/jwmrc-personal2
+CONF_FILE=${HOME}/.jwm/jwmrc-personal
+CONF_FILE2=${HOME}/.jwm/jwmrc-personal2
 TEST=
 
 ##------confirmation--------->>
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/focusModel b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/focusModel
index 428cd2f..ad89826 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/focusModel
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/focusModel
@@ -6,9 +6,9 @@
 
 CLICK='<FocusModel>click</FocusModel>'
 SLOPPY='<FocusModel>sloppy</FocusModel>'
-CONFIG="/root/.jwm/jwmrc-personal"
-CONF="/root/.jwm/jwmrc-personal-temp"
-CONF2="/root/.jwm/jwmrc-personal-temp2"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONF="${HOME}/.jwm/jwmrc-personal-temp"
+CONF2="${HOME}/.jwm/jwmrc-personal-temp2"
 TMP="/tmp/inputbox.tmp.$$"
 
 CHOICE=click
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/gtk2jwm b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/gtk2jwm
index 1c63b0d..31acc28 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/gtk2jwm
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/gtk2jwm
@@ -19,10 +19,10 @@
 
 ##-------------variables---------------->>
 		
-GTKTHEME=`fgrep 'include' /root/.gtkrc-2.0 | fgrep '/usr/share/themes/' | grep -v '^#' | fgrep -m1 'gtkrc' | tr -d "'" | tr -d '"' | sed 's/include //' | tr -d '\t' | tr -d ' '`
+GTKTHEME=`fgrep 'include' ${HOME}/.gtkrc-2.0 | fgrep '/usr/share/themes/' | grep -v '^#' | fgrep -m1 'gtkrc' | tr -d "'" | tr -d '"' | sed 's/include //' | tr -d '\t' | tr -d ' '`
 [ ! -e $GTKTHEME ] && exit 1 
 
-JWMTHEME=/root/.jwm/jwmrc-theme
+JWMTHEME=${HOME}/.jwm/jwmrc-theme
 
 MENU_BG=
 ACTIVE_BG=
@@ -39,14 +39,14 @@ PAGER_BG=`grep -v "^#" $GTKTHEME | grep -m1 '\Wbg\[ACTIVE\]' | cut -d'"' -f2`
 FG_SELECTED=`grep -v "^#" $GTKTHEME | grep -m1 '\Wfg\[SELECTED\]' | cut -d'"' -f2`
 
 #save them...
-echo '#This is written to by /usr/local/jwmconfig2/gtk2jwm script' > /root/.jwm/jwm_colors
-echo "MENU_BG='${MENU_BG}'" >> /root/.jwm/jwm_colors
-echo "ACTIVE_BG='${ACTIVE_BG}'" >> /root/.jwm/jwm_colors
-echo "FOREGROUND='${FOREGROUND}'" >> /root/.jwm/jwm_colors
-echo "PAGER_BG='${PAGER_BG}'" >> /root/.jwm/jwm_colors
-echo "FG_SELECTED='${FG_SELECTED}'" >> /root/.jwm/jwm_colors
-
-rm -f /root/.tcl-gtk 
+echo '#This is written to by /usr/local/jwmconfig2/gtk2jwm script' > ${HOME}/.jwm/jwm_colors
+echo "MENU_BG='${MENU_BG}'" >> ${HOME}/.jwm/jwm_colors
+echo "ACTIVE_BG='${ACTIVE_BG}'" >> ${HOME}/.jwm/jwm_colors
+echo "FOREGROUND='${FOREGROUND}'" >> ${HOME}/.jwm/jwm_colors
+echo "PAGER_BG='${PAGER_BG}'" >> ${HOME}/.jwm/jwm_colors
+echo "FG_SELECTED='${FG_SELECTED}'" >> ${HOME}/.jwm/jwm_colors
+
+rm -f ${HOME}/.tcl-gtk 
 if [ -z "$MENU_BG" ]; then
  echo > "$JWMTHEME"
  pidof jwm >/dev/null && jwm -restart
@@ -54,11 +54,11 @@ if [ -z "$MENU_BG" ]; then
 else 
  # set variables for tcl/tk apps:
  ## need to make sure they're not blank
- [ "$MENU_BG" ] && echo  "bg_normal=$MENU_BG" >>/root/.tcl-gtk
- [ "$ACTIVE_BG" ] && echo  "bg_selected=$ACTIVE_BG" >>/root/.tcl-gtk
- [ "$PAGER_BG" ] && echo  "bg_active=$PAGER_BG" >>/root/.tcl-gtk
- [ "$FOREGROUND" ] && echo  "fg_normal=$FOREGROUND" >>/root/.tcl-gtk
- [ "$FG_SELECTED" ] && echo  "fg_selected=$FG_SELECTED" >>/root/.tcl-gtk
+ [ "$MENU_BG" ] && echo  "bg_normal=$MENU_BG" >>${HOME}/.tcl-gtk
+ [ "$ACTIVE_BG" ] && echo  "bg_selected=$ACTIVE_BG" >>${HOME}/.tcl-gtk
+ [ "$PAGER_BG" ] && echo  "bg_active=$PAGER_BG" >>${HOME}/.tcl-gtk
+ [ "$FOREGROUND" ] && echo  "fg_normal=$FOREGROUND" >>${HOME}/.tcl-gtk
+ [ "$FG_SELECTED" ] && echo  "fg_selected=$FG_SELECTED" >>${HOME}/.tcl-gtk
  
   # create gradient colours:
   DIFF="16#20"
@@ -153,8 +153,8 @@ echo "$DEFAULT" > "$JWMTHEME"
 
 #########
 #John Doe created code for the applet backgrounds, old jwmconfig, port here...
-TrayFile="/root/.jwmrc-tray"
-TrayFileBak="/root/.jwmrc-tray.bak"
+TrayFile="${HOME}/.jwmrc-tray"
+TrayFileBak="${HOME}/.jwmrc-tray.bak"
 
 BackgroundColor="$MENU_BG" #"#ffc100"
 
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/jwmConfigMgr b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/jwmConfigMgr
index 11deb94..d6779ff 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/jwmConfigMgr
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/jwmConfigMgr
@@ -5,7 +5,7 @@
 ##--------variables---------->>
 SCRIPT_DIR="/usr/local/jwmconfig2"
 MINI_ICONS_DIR="/usr/local/lib/X11/mini-icons"
-HOME_DIR="/root/.jwm"
+HOME_DIR="${HOME}/.jwm"
 echo "SCRIPT_DIR='${SCRIPT_DIR}'" > /tmp/JWMCONFIGVARS
 echo "MINI_ICONS_DIR='${MINI_ICONS_DIR}'" >> /tmp/JWMCONFIGVARS
 echo "HOME_DIR='${HOME_DIR}'" >> /tmp/JWMCONFIGVARS
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/listShortcuts b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/listShortcuts
index 75622a8..c468e33 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/listShortcuts
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/listShortcuts
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-HOME_DIR=/root/.jwm
+HOME_DIR=${HOME}/.jwm
 SCRIPT_DIR="/usr/local/jwmconfig"
 
 ##----lists shortcuts contained in the jwmrc-personal file---->>
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/panel-buttons b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/panel-buttons
index 20b681f..cc6a0e2 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/panel-buttons
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/panel-buttons
@@ -9,21 +9,21 @@
 #
 #####################################
 
-if [ "`ls /root/.jwmrc-tray-bak`" = "" ]; then
-cp /root/.jwmrc-tray /root/.jwmrc-tray-bak  ### makes .jwmrc-tray-bak backup file unless it already exists
+if [ "`ls ${HOME}/.jwmrc-tray-bak`" = "" ]; then
+cp ${HOME}/.jwmrc-tray ${HOME}/.jwmrc-tray-bak  ### makes .jwmrc-tray-bak backup file unless it already exists
 fi
-cat /root/.jwmrc-tray | sed '/^$/d' > /tmp/.jwmrc-tray  ### remove all blank lines in .jwmrc-tray
-mv /tmp/.jwmrc-tray /root/
+cat ${HOME}/.jwmrc-tray | sed '/^$/d' > /tmp/.jwmrc-tray  ### remove all blank lines in .jwmrc-tray
+mv /tmp/.jwmrc-tray ${HOME}/
 
-total=`wc -l /root/.jwmrc-tray | sed -e 's/ *//' | sed -e 's/ .*//g'` ### get total number of lines
-low=`grep '<TrayButton label="Menu"'  -n /root/.jwmrc-tray | sed -e 's/\:.*>//g'`  ### get line number with the Menu button
-high=`grep '<!-- Additional Pager attributes; width, height -->' -n /root/.jwmrc-tray | sed -e 's/\:.*>//g'` ### get line number with Additional Pager
+total=`wc -l ${HOME}/.jwmrc-tray | sed -e 's/ *//' | sed -e 's/ .*//g'` ### get total number of lines
+low=`grep '<TrayButton label="Menu"'  -n ${HOME}/.jwmrc-tray | sed -e 's/\:.*>//g'`  ### get line number with the Menu button
+high=`grep '<!-- Additional Pager attributes; width, height -->' -n ${HOME}/.jwmrc-tray | sed -e 's/\:.*>//g'` ### get line number with Additional Pager
 last=`echo "(("$total" - "$high" + 2))" | bc -l` 
 begin=`echo "(("$low" + 1))" | bc -l` ### first line with panel buttons
 #end=`echo "(("$high" - 1))" | bc -l` ### last line with panel buttons
 
-cat /root/.jwmrc-tray | head -n "$low" > /tmp/jwmrc-tray-1.txt
-cat /root/.jwmrc-tray | tail -n "$last" > /tmp/jwmrc-tray-3.txt
+cat ${HOME}/.jwmrc-tray | head -n "$low" > /tmp/jwmrc-tray-1.txt
+cat ${HOME}/.jwmrc-tray | tail -n "$last" > /tmp/jwmrc-tray-3.txt
 
 num=1
 
@@ -70,7 +70,7 @@ case $? in
     echo "Box closed.";;
 esac
 
-cp /root/.jwmrc-tray /root/.jwmrc-tray-bak
+cp ${HOME}/.jwmrc-tray ${HOME}/.jwmrc-tray-bak
 exit 0
 fi
 
@@ -82,11 +82,11 @@ if [ "$choice" = Edit ]; then
 
 while [ "$begin" != "$high" ]; do
 
-cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-popup.txt  ### gets popup text
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-popup.txt  ### gets popup text
 popup=`cat /tmp/tmp-popup.txt`
-cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e "s/$popup//" | sed -e 's/" icon="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-icon.txt  ### gets icon text
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//' | sed -e "s/$popup//" | sed -e 's/" icon="//' | sed -e 's/\".*//' | sed 's/^[ \t]*//' > /tmp/tmp-icon.txt  ### gets icon text
 icon=`cat /tmp/tmp-icon.txt`
-cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed 's/\<.*\"//g' | sed -e 's/<\/TrayButton>//' | sed -e 's/<>//' | sed 's/^[ \t]*//' > /tmp/tmp-exec.txt  ### gets executable text
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed 's/\<.*\"//g' | sed -e 's/<\/TrayButton>//' | sed -e 's/<>//' | sed 's/^[ \t]*//' > /tmp/tmp-exec.txt  ### gets executable text
 #action=`cat /tmp/tmp-exec.txt`
 
 ### This is the Edit gui
@@ -150,7 +150,7 @@ done
 
 cat /tmp/jwmrc-tray-2.txt >> /tmp/jwmrc-tray-1.txt
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 rm -f /tmp/jwmrc-tray-*
 rm -f /tmp/tmp-popup*.txt
@@ -173,7 +173,7 @@ fi
 
 if [ "$choice" = Restore ]; then
 
-mv /root/.jwmrc-tray-bak /root/.jwmrc-tray
+mv ${HOME}/.jwmrc-tray-bak ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Your original .jwmrc-tray
@@ -191,7 +191,7 @@ fi
 
 if [ "$choice" = Add ]; then
 while [ "$begin" != "$high" ]; do
-cat /root/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel.txt
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel.txt
 begin=`echo "(("$begin" + 1))" | bc -l`
 shift
 done
@@ -246,7 +246,7 @@ echo "$new_line" >> /tmp/jwmrc-tray-panel.txt
 
 cat /tmp/jwmrc-tray-panel.txt >> /tmp/jwmrc-tray-1.txt
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Adding complete.
@@ -278,7 +278,7 @@ while [ "$begin" != "$high" ]; do
 
 Xdialog --backtitle "Remove panel buttons" \
 	--title "RADIOLIST BOX" \
-        --radiolist "Would you like to delete `cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'`\n\
+        --radiolist "Would you like to delete `cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'`\n\
 from the panel? If you want to delete it choose\n\
 yes, otherwise choose no." 26 46 5 \
         "no"    "no do not delete this button" ON \
@@ -298,7 +298,7 @@ case $retval in
 esac
 
 if [ "$choice" = no ]; then
-cat /root/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-1.txt
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-1.txt
 fi
 begin=`echo "(("$begin" + 1))" | bc -l`
 y=`echo "(("$y" + 1))" | bc -l`
@@ -307,7 +307,7 @@ shift
 done
 
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Removing complete.
@@ -327,10 +327,10 @@ if [ "$choice" = Move ]; then
 y=1
 z=`echo "(("$high" - "$begin"))" | bc -l`
 while [ "$begin" != "$high" ]; do
-cat /root/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel-"$y".txt
+cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" >> /tmp/jwmrc-tray-panel-"$y".txt
 
 Xdialog --title "INPUT BOX" \
-        --inputbox "`cat /root/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'` is button $y of your $z buttons.\n\
+        --inputbox "`cat ${HOME}/.jwmrc-tray | sed -n ""$begin"p" | sed -e 's/<TrayButton popup="//g' | sed -e 's/\".*//g' | sed 's/^[ \t]*//'` is button $y of your $z buttons.\n\
 \n\
 If you would like that button in another\n\
 position please enter the number below." 18 45 2> /tmp/inputbox.tmp.$$
@@ -405,7 +405,7 @@ done
 
 cat /tmp/jwmrc-tray-tmp-* >> /tmp/jwmrc-tray-1.txt
 cat /tmp/jwmrc-tray-3.txt >> /tmp/jwmrc-tray-1.txt
-mv /tmp/jwmrc-tray-1.txt /root/.jwmrc-tray
+mv /tmp/jwmrc-tray-1.txt ${HOME}/.jwmrc-tray
 
 Xdialog --title "MESSAGE BOX" \
         --msgbox "Moving complete.
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/taskbarConfig b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/taskbarConfig
index efd25e7..6077740 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/taskbarConfig
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/taskbarConfig
@@ -10,9 +10,9 @@
 TMP="/tmp/checklist.tmp.$$"
 ISSET="true"
 ISOFF="false"
-CONFIG="/root/.jwmrc-tray"
-CONFIG2="/root/.jwmrc-tray-bak"
-CONF="/root/.jwmrc-tray-temp"
+CONFIG="${HOME}/.jwmrc-tray"
+CONFIG2="${HOME}/.jwmrc-tray-bak"
+CONF="${HOME}/.jwmrc-tray-temp"
 
 #----Set defaults---->>
 AUTO_OFF=ON
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/taskbarHeight b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/taskbarHeight
index 8008aba..5355443 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/taskbarHeight
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/taskbarHeight
@@ -13,9 +13,9 @@ SHRT="20"
 NORM="28"
 TALL="34"
 XTTL="42"
-CONFIG="/root/.jwmrc-tray"
-CONFIG2="/root/.jwmrc-tray-bak"
-CONF="/root/.jwmrc-tray-temp"
+CONFIG="${HOME}/.jwmrc-tray"
+CONFIG2="${HOME}/.jwmrc-tray-bak"
+CONF="${HOME}/.jwmrc-tray-temp"
 
 #----Set defaults---->>
 IS_SHRT=off
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/taskbarPlace b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/taskbarPlace
index 9f6f340..6ae2e02 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/taskbarPlace
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/taskbarPlace
@@ -10,9 +10,9 @@
 TMP="/tmp/checklist.tmp.$$"
 TOP="0"
 BTM="-1"
-CONFIG="/root/.jwmrc-tray"
-CONFIG2="/root/.jwmrc-tray-bak"
-CONF="/root/.jwmrc-tray-temp"
+CONFIG="${HOME}/.jwmrc-tray"
+CONFIG2="${HOME}/.jwmrc-tray-bak"
+CONF="${HOME}/.jwmrc-tray-temp"
 
 #----Set defaults---->>
 AT_BTM=ON
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/theme_switcher b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/theme_switcher
index a93cbf8..7f97d50 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/theme_switcher
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/theme_switcher
@@ -6,13 +6,13 @@
 #  <text><label>\"${CHARPAD}\"</label></text>
 
 ICONSETSGUI=""
-for ONETHEME in `find /root/.jwm/themes/ -mindepth 1 -maxdepth 1 -type f | grep 'jwmrc' | sed -e 's/-jwmrc//' | tr '\n' ' '`
+for ONETHEME in `find ${HOME}/.jwm/themes/ -mindepth 1 -maxdepth 1 -type f | grep 'jwmrc' | sed -e 's/-jwmrc//' | tr '\n' ' '`
 do
  ONETHEME="`basename $ONETHEME`"
  ICONSETSGUI="$ICONSETSGUI
  <hbox>
-  <pixmap><input file>/root/.jwm/themes/${ONETHEME}-tray.png</input></pixmap>
-  <pixmap><input file>/root/.jwm/themes/${ONETHEME}-window.png</input></pixmap>
+  <pixmap><input file>${HOME}/.jwm/themes/${ONETHEME}-tray.png</input></pixmap>
+  <pixmap><input file>${HOME}/.jwm/themes/${ONETHEME}-window.png</input></pixmap>
   <vbox>
    <pixmap><input file>/usr/local/lib/X11/pixmaps/invisible96x8.png</input></pixmap>
    <button><label>${ONETHEME}</label></button>
@@ -43,22 +43,22 @@ eval "$RETSTUFF"
 
 NEWTHEME="$EXIT"
 [ "$NEWTHEME" = "" ] && exit
-[ ! -f /root/.jwm/themes/${NEWTHEME}-jwmrc ] && exit
+[ ! -f ${HOME}/.jwm/themes/${NEWTHEME}-jwmrc ] && exit
 
 if [ "$NEWTHEME" != "" ];then
  #select chosen theme...
- cp -f /root/.jwm/themes/${NEWTHEME}-jwmrc /root/.jwm/jwmrc-theme
+ cp -f ${HOME}/.jwm/themes/${NEWTHEME}-jwmrc ${HOME}/.jwm/jwmrc-theme
  #set correct backgrounds for applets...
- cp -f /root/.jwm/themes/${NEWTHEME}-colors /root/.jwm/jwm_colors
- #...note, /root/.xinitrc reads this file to set background for absvolume.
+ cp -f ${HOME}/.jwm/themes/${NEWTHEME}-colors ${HOME}/.jwm/jwm_colors
+ #...note, ${HOME}/.xinitrc reads this file to set background for absvolume.
  #...note, jwm_colors is written to by /usr/local/jwmconfig2/gtk2jwm script
 
-. /root/.jwm/jwm_colors #gives MENU_BG, PAGER_BG
+. ${HOME}/.jwm/jwm_colors #gives MENU_BG, PAGER_BG
 
  #########
  #John Doe created code for the applet backgrounds, old jwmconfig, port here...
- TrayFile="/root/.jwmrc-tray"
- TrayFileBak="/root/.jwmrc-tray.bak"
+ TrayFile="${HOME}/.jwmrc-tray"
+ TrayFileBak="${HOME}/.jwmrc-tray.bak"
 
  BackgroundColor="$MENU_BG" #"#ffc100"
  [ "$BackgroundColor" = "" ] && BackgroundColor='#ffc100'
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/trayInsert b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/trayInsert
index 3c28f06..778136b 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/trayInsert
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/trayInsert
@@ -20,9 +20,9 @@
 ##-----taskbarConfig----->>
 
 TMP="/tmp/checklist.tmp.$$"
-CONFIG="/root/.jwm/jwmrc-personal"
-CONFIG2="/root/.jwm/jwmrc-personal-bak"
-CONF="/root/.jwm/jwmrc-personal-temp"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONFIG2="${HOME}/.jwm/jwmrc-personal-bak"
+CONF="${HOME}/.jwm/jwmrc-personal-temp"
 DCL="<TaskListStyle insert=\"left\"/>"
 DCR="<TaskListStyle insert=\"right\"/>"
 DCO="<TaskListStyle insert="
diff --git a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/virtualDesk b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/virtualDesk
index 67a7eac..3ab3dd5 100755
--- a/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/virtualDesk
+++ b/puppy-unleashed/packages/jwmconfig2-20090207/usr/local/jwmconfig2/virtualDesk
@@ -9,9 +9,9 @@
 MINTOPS=1
 MAXTOPS=8
 DC="<Desktops count=\"[0-9][0-9]*\"/>"
-CONFIG="/root/.jwm/jwmrc-personal"
-CONFIG2="/root/.jwm/jwmrc-personal-bak"
-CONF="/root/.jwm/jwmrc-personal-temp"
+CONFIG="${HOME}/.jwm/jwmrc-personal"
+CONFIG2="${HOME}/.jwm/jwmrc-personal-bak"
+CONF="${HOME}/.jwm/jwmrc-personal-temp"
 TMP="/tmp/inputbox.tmp.$$"
 
 #-----Backup current settings----->>
diff --git a/puppy-unleashed/packages/net_setup-20081005/usr/sbin/ndiswrapperGUI.sh b/puppy-unleashed/packages/net_setup-20081005/usr/sbin/ndiswrapperGUI.sh
index 7931da8..c5ae90e 100755
--- a/puppy-unleashed/packages/net_setup-20081005/usr/sbin/ndiswrapperGUI.sh
+++ b/puppy-unleashed/packages/net_setup-20081005/usr/sbin/ndiswrapperGUI.sh
@@ -94,7 +94,7 @@ Please try again.
 #=============================================================================
 showNdiswrapperGUI()
 {
-  CONFIG_DIR=/root/.config/ndiswrapperGUI
+  CONFIG_DIR=${HOME}/.config/ndiswrapperGUI
 
   [ -d "$CONFIG_DIR" ] || mkdir -p "$CONFIG_DIR"
   PREV_LOCATION=$(cat "$CONFIG_DIR/prev_location" 2>/dev/null)
diff --git a/puppy-unleashed/packages/net_setup-20081031/usr/sbin/ndiswrapperGUI.sh b/puppy-unleashed/packages/net_setup-20081031/usr/sbin/ndiswrapperGUI.sh
index 86b2016..c411864 100755
--- a/puppy-unleashed/packages/net_setup-20081031/usr/sbin/ndiswrapperGUI.sh
+++ b/puppy-unleashed/packages/net_setup-20081031/usr/sbin/ndiswrapperGUI.sh
@@ -95,7 +95,7 @@ selectDriverFile()
 #=============================================================================
 showNdiswrapperGUI()
 {
-  CONFIG_DIR=/root/.config/ndiswrapperGUI
+  CONFIG_DIR=${HOME}/.config/ndiswrapperGUI
 
   [ -d "$CONFIG_DIR" ] || mkdir -p "$CONFIG_DIR"
   PREV_LOCATION=$(cat "$CONFIG_DIR/prev_location" 2>/dev/null)
diff --git a/puppy-unleashed/packages/net_setup-20090401/usr/sbin/ndiswrapperGUI.sh b/puppy-unleashed/packages/net_setup-20090401/usr/sbin/ndiswrapperGUI.sh
index 86b2016..c411864 100755
--- a/puppy-unleashed/packages/net_setup-20090401/usr/sbin/ndiswrapperGUI.sh
+++ b/puppy-unleashed/packages/net_setup-20090401/usr/sbin/ndiswrapperGUI.sh
@@ -95,7 +95,7 @@ selectDriverFile()
 #=============================================================================
 showNdiswrapperGUI()
 {
-  CONFIG_DIR=/root/.config/ndiswrapperGUI
+  CONFIG_DIR=${HOME}/.config/ndiswrapperGUI
 
   [ -d "$CONFIG_DIR" ] || mkdir -p "$CONFIG_DIR"
   PREV_LOCATION=$(cat "$CONFIG_DIR/prev_location" 2>/dev/null)
diff --git a/puppy-unleashed/packages/net_setup-20090404/usr/sbin/ndiswrapperGUI.sh b/puppy-unleashed/packages/net_setup-20090404/usr/sbin/ndiswrapperGUI.sh
index 86b2016..c411864 100755
--- a/puppy-unleashed/packages/net_setup-20090404/usr/sbin/ndiswrapperGUI.sh
+++ b/puppy-unleashed/packages/net_setup-20090404/usr/sbin/ndiswrapperGUI.sh
@@ -95,7 +95,7 @@ selectDriverFile()
 #=============================================================================
 showNdiswrapperGUI()
 {
-  CONFIG_DIR=/root/.config/ndiswrapperGUI
+  CONFIG_DIR=${HOME}/.config/ndiswrapperGUI
 
   [ -d "$CONFIG_DIR" ] || mkdir -p "$CONFIG_DIR"
   PREV_LOCATION=$(cat "$CONFIG_DIR/prev_location" 2>/dev/null)
diff --git a/puppy-unleashed/packages/net_setup-3.96-localised/usr/sbin/ndiswrapperGUI.sh b/puppy-unleashed/packages/net_setup-3.96-localised/usr/sbin/ndiswrapperGUI.sh
index 8b10b2e..d84117e 100755
--- a/puppy-unleashed/packages/net_setup-3.96-localised/usr/sbin/ndiswrapperGUI.sh
+++ b/puppy-unleashed/packages/net_setup-3.96-localised/usr/sbin/ndiswrapperGUI.sh
@@ -35,7 +35,7 @@ selectDriverFile()
 #=============================================================================
 showNdiswrapperGUI()
 {
-  CONFIG_DIR=/root/.config/ndiswrapperGUI
+  CONFIG_DIR=${HOME}/.config/ndiswrapperGUI
 
   mkdir -p $CONFIG_DIR
   PREV_LOCATION=`cat "$CONFIG_DIR/prev_location"`
diff --git a/puppy-unleashed/packages/net_setup-3.96-localised/usr/sbin/net-setup.sh b/puppy-unleashed/packages/net_setup-3.96-localised/usr/sbin/net-setup.sh
index 0670be3..a21dcc6 100755
--- a/puppy-unleashed/packages/net_setup-3.96-localised/usr/sbin/net-setup.sh
+++ b/puppy-unleashed/packages/net_setup-3.96-localised/usr/sbin/net-setup.sh
@@ -84,7 +84,7 @@ showMainWindow()
 
 #begin rerwin
 		#Interpret client-option checkbox; allow duid only if supported.
-		[ "$CHKBOXDUID" = "true" ] && [ -d /var/lib/dhcpcd -o ! -d /etc/dhcpc ] && touch /root/.dhcpcd.duid || rm /root/.dhcpcd.duid 2> /dev/null   #rerwin
+		[ "$CHKBOXDUID" = "true" ] && [ -d /var/lib/dhcpcd -o ! -d /etc/dhcpc ] && touch ${HOME}/.dhcpcd.duid || rm ${HOME}/.dhcpcd.duid 2> /dev/null   #rerwin
 		[ -d /etc/dhcpc -a ! -d /var/lib/dhcpcd ] && CHECKDUID="false" || CHECKDUID=$CHKBOXDUID  #Update check-state in case user returns to main dialog - but force uncheck if running older dhcpcd.
 #end rerwin
 
@@ -217,7 +217,7 @@ $INTERFACE_INFO\"</label></text>
  #${LOADEDETH}" > /tmp/net-setup_MSGMODULES.txt
 
   #Rerwin: Initialize Client-identification option.
-  [ -f /root/.dhcpcd.duid ] && CHECKDUID="true" || CHECKDUID="false"   #rerwin
+  [ -f ${HOME}/.dhcpcd.duid ] && CHECKDUID="true" || CHECKDUID="false"   #rerwin
 
 } # end refreshMainWindowInfo
 
@@ -891,10 +891,10 @@ setupDHCP()
 		sleep 5
 
 #begin rerwin - select type of client ID and set up for common duid for pup-save or within partition.
-		if [ -f /root/.dhcpcd.duid ];then  #Use default if indicated, or MAC address, as client ID
-		 if [ -s /mnt/home/.common.duid -o -s /root/.dhcpcd.duid ];then  #a partition-common duid exists.
+		if [ -f ${HOME}/.dhcpcd.duid ];then  #Use default if indicated, or MAC address, as client ID
+		 if [ -s /mnt/home/.common.duid -o -s ${HOME}/.dhcpcd.duid ];then  #a partition-common duid exists.
 	 	  [ ! -d /var/lib/dhcpcd ] && mkdir /var/lib/dhcpcd
-		  [ -s /mnt/home/.common.duid ] && cp /mnt/home/.common.duid /var/lib/dhcpcd/dhcpcd.duid || cp /root/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid  #use partition-common duid.
+		  [ -s /mnt/home/.common.duid ] && cp /mnt/home/.common.duid /var/lib/dhcpcd/dhcpcd.duid || cp ${HOME}/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid  #use partition-common duid.
 		 #else let dhcpcd use previously acquired duid or create new one
 		 fi
 		 dhcpcd -d $INTERFACE
@@ -906,7 +906,7 @@ setupDHCP()
 #end rerwin
 			HAS_ERROR=0
 #begin rerwin - Save copy of duid, if any, for use during reboot and as partition-common duid.
-			cp /var/lib/dhcpcd/dhcpcd.duid /root/.dhcpcd.duid 2>/dev/null
+			cp /var/lib/dhcpcd/dhcpcd.duid ${HOME}/.dhcpcd.duid 2>/dev/null
 			[ -d /mnt/home -a ! -s /mnt/home/.common.duid ] && cp /var/lib/dhcpcd/dhcpcd.duid /mnt/home/.common.duid 2>/dev/null
 #end rerwin
 		else
@@ -926,7 +926,7 @@ echo \"Trying to get IP address from DHCP server (60sec timeout)...\" > /dev/con
 rm /etc/dhcpc/dhcpcd-${INTERFACE}.pid 2>/dev/null #if left over from last session, causes trouble.
 rm /etc/dhcpc/dhcpcd-${INTERFACE}.cache 2>/dev/null #ditto
 rm /etc/dhcpc/dhcpcd-${INTERFACE}.info 2>/dev/null #ditto
-if [ ! -f /root/.dhcpcd.duid ];then
+if [ ! -f ${HOME}/.dhcpcd.duid ];then
  [ -d /etc/dhcpc ] && dhcpcd $INTERFACE || dhcpcd -I '' $INTERFACE
 else
  dhcpcd $INTERFACE
diff --git a/puppy-unleashed/packages/net_setup-4.00-1/usr/sbin/ndiswrapperGUI.sh b/puppy-unleashed/packages/net_setup-4.00-1/usr/sbin/ndiswrapperGUI.sh
index 1044c15..bb645c3 100755
--- a/puppy-unleashed/packages/net_setup-4.00-1/usr/sbin/ndiswrapperGUI.sh
+++ b/puppy-unleashed/packages/net_setup-4.00-1/usr/sbin/ndiswrapperGUI.sh
@@ -36,7 +36,7 @@ selectDriverFile()
 #=============================================================================
 showNdiswrapperGUI()
 {
-  CONFIG_DIR=/root/.config/ndiswrapperGUI
+  CONFIG_DIR=${HOME}/.config/ndiswrapperGUI
 
   mkdir -p $CONFIG_DIR
   PREV_LOCATION="`cat "$CONFIG_DIR/prev_location"`"
diff --git a/puppy-unleashed/packages/net_setup-4.00-1/usr/sbin/net-setup.sh b/puppy-unleashed/packages/net_setup-4.00-1/usr/sbin/net-setup.sh
index f040206..3cc4ace 100755
--- a/puppy-unleashed/packages/net_setup-4.00-1/usr/sbin/net-setup.sh
+++ b/puppy-unleashed/packages/net_setup-4.00-1/usr/sbin/net-setup.sh
@@ -75,7 +75,7 @@ showMainWindow()
 
 #begin rerwin
 		#Interpret client-option checkbox; allow duid only if supported.
-		[ "$CHKBOXDUID" = "true" ] && [ -d /var/lib/dhcpcd -o ! -d /etc/dhcpc ] && touch /root/.dhcpcd.duid || rm /root/.dhcpcd.duid 2> /dev/null   #rerwin
+		[ "$CHKBOXDUID" = "true" ] && [ -d /var/lib/dhcpcd -o ! -d /etc/dhcpc ] && touch ${HOME}/.dhcpcd.duid || rm ${HOME}/.dhcpcd.duid 2> /dev/null   #rerwin
 		[ -d /etc/dhcpc -a ! -d /var/lib/dhcpcd ] && CHECKDUID="false" || CHECKDUID=$CHKBOXDUID  #Update check-state in case user returns to main dialog - but force uncheck if running older dhcpcd.
 #end rerwin
 
@@ -212,7 +212,7 @@ To test or configure an interface, click on its button."  > /tmp/net-setup_MSGIN
  #${LOADEDETH}" > /tmp/net-setup_MSGMODULES.txt
 
 #Rerwin: Initialize Client-identification option.
-[ -f /root/.dhcpcd.duid ] && CHECKDUID="true" || CHECKDUID="false"   #rerwin
+[ -f ${HOME}/.dhcpcd.duid ] && CHECKDUID="true" || CHECKDUID="false"   #rerwin
 
 } # end refreshMainWindowInfo
 
@@ -963,10 +963,10 @@ setupDHCP()
 		sleep 5
 
 #begin rerwin - select type of client ID and set up for common duid for pup-save or within partition.
-		if [ -f /root/.dhcpcd.duid ];then  #Use default if indicated, or MAC address, as client ID
-		 if [ -s /mnt/home/.common.duid -o -s /root/.dhcpcd.duid ];then  #a partition-common duid exists.
+		if [ -f ${HOME}/.dhcpcd.duid ];then  #Use default if indicated, or MAC address, as client ID
+		 if [ -s /mnt/home/.common.duid -o -s ${HOME}/.dhcpcd.duid ];then  #a partition-common duid exists.
 	 	  [ ! -d /var/lib/dhcpcd ] && mkdir /var/lib/dhcpcd
-		  [ -s /mnt/home/.common.duid ] && cp /mnt/home/.common.duid /var/lib/dhcpcd/dhcpcd.duid || cp /root/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid  #use partition-common duid.
+		  [ -s /mnt/home/.common.duid ] && cp /mnt/home/.common.duid /var/lib/dhcpcd/dhcpcd.duid || cp ${HOME}/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid  #use partition-common duid.
 		 #else let dhcpcd use previously acquired duid or create new one
 		 fi
 		 dhcpcd -d $INTERFACE
@@ -978,7 +978,7 @@ setupDHCP()
 #end rerwin
 			HAS_ERROR=0
 #begin rerwin - Save copy of duid, if any, for use during reboot and as partition-common duid.
-			cp /var/lib/dhcpcd/dhcpcd.duid /root/.dhcpcd.duid 2>/dev/null
+			cp /var/lib/dhcpcd/dhcpcd.duid ${HOME}/.dhcpcd.duid 2>/dev/null
 			[ -d /mnt/home -a ! -s /mnt/home/.common.duid ] && cp /var/lib/dhcpcd/dhcpcd.duid /mnt/home/.common.duid 2>/dev/null
 #end rerwin
 		else
@@ -999,11 +999,11 @@ echo \"Trying to get IP address from DHCP server (60sec timeout)...\" > /dev/con
 rm /etc/dhcpc/dhcpcd-${INTERFACE}.pid 2>/dev/null #if left over from last session, causes trouble.
 rm /etc/dhcpc/dhcpcd-${INTERFACE}.cache 2>/dev/null #ditto
 rm /etc/dhcpc/dhcpcd-${INTERFACE}.info 2>/dev/null #ditto
-if [ ! -f /root/.dhcpcd.duid ];then
+if [ ! -f ${HOME}/.dhcpcd.duid ];then
  [ -d /etc/dhcpc ] && dhcpcd $INTERFACE || dhcpcd -I '' $INTERFACE
 else
  #[ ! -d /var/lib/dhcpcd ] && mkdir /var/lib/dhcpcd
- #[ -s /root/.dhcpcd.duid ] && cp /root/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid
+ #[ -s ${HOME}/.dhcpcd.duid ] && cp ${HOME}/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid
  dhcpcd $INTERFACE
 fi"   #Use default if indicated, or MAC address, as client ID.  #rerwin
   else
diff --git a/puppy-unleashed/packages/net_setup-4.00/usr/sbin/ndiswrapperGUI.sh b/puppy-unleashed/packages/net_setup-4.00/usr/sbin/ndiswrapperGUI.sh
index 1044c15..bb645c3 100755
--- a/puppy-unleashed/packages/net_setup-4.00/usr/sbin/ndiswrapperGUI.sh
+++ b/puppy-unleashed/packages/net_setup-4.00/usr/sbin/ndiswrapperGUI.sh
@@ -36,7 +36,7 @@ selectDriverFile()
 #=============================================================================
 showNdiswrapperGUI()
 {
-  CONFIG_DIR=/root/.config/ndiswrapperGUI
+  CONFIG_DIR=${HOME}/.config/ndiswrapperGUI
 
   mkdir -p $CONFIG_DIR
   PREV_LOCATION="`cat "$CONFIG_DIR/prev_location"`"
diff --git a/puppy-unleashed/packages/net_setup-4.00/usr/sbin/net-setup.sh b/puppy-unleashed/packages/net_setup-4.00/usr/sbin/net-setup.sh
index f040206..3cc4ace 100755
--- a/puppy-unleashed/packages/net_setup-4.00/usr/sbin/net-setup.sh
+++ b/puppy-unleashed/packages/net_setup-4.00/usr/sbin/net-setup.sh
@@ -75,7 +75,7 @@ showMainWindow()
 
 #begin rerwin
 		#Interpret client-option checkbox; allow duid only if supported.
-		[ "$CHKBOXDUID" = "true" ] && [ -d /var/lib/dhcpcd -o ! -d /etc/dhcpc ] && touch /root/.dhcpcd.duid || rm /root/.dhcpcd.duid 2> /dev/null   #rerwin
+		[ "$CHKBOXDUID" = "true" ] && [ -d /var/lib/dhcpcd -o ! -d /etc/dhcpc ] && touch ${HOME}/.dhcpcd.duid || rm ${HOME}/.dhcpcd.duid 2> /dev/null   #rerwin
 		[ -d /etc/dhcpc -a ! -d /var/lib/dhcpcd ] && CHECKDUID="false" || CHECKDUID=$CHKBOXDUID  #Update check-state in case user returns to main dialog - but force uncheck if running older dhcpcd.
 #end rerwin
 
@@ -212,7 +212,7 @@ To test or configure an interface, click on its button."  > /tmp/net-setup_MSGIN
  #${LOADEDETH}" > /tmp/net-setup_MSGMODULES.txt
 
 #Rerwin: Initialize Client-identification option.
-[ -f /root/.dhcpcd.duid ] && CHECKDUID="true" || CHECKDUID="false"   #rerwin
+[ -f ${HOME}/.dhcpcd.duid ] && CHECKDUID="true" || CHECKDUID="false"   #rerwin
 
 } # end refreshMainWindowInfo
 
@@ -963,10 +963,10 @@ setupDHCP()
 		sleep 5
 
 #begin rerwin - select type of client ID and set up for common duid for pup-save or within partition.
-		if [ -f /root/.dhcpcd.duid ];then  #Use default if indicated, or MAC address, as client ID
-		 if [ -s /mnt/home/.common.duid -o -s /root/.dhcpcd.duid ];then  #a partition-common duid exists.
+		if [ -f ${HOME}/.dhcpcd.duid ];then  #Use default if indicated, or MAC address, as client ID
+		 if [ -s /mnt/home/.common.duid -o -s ${HOME}/.dhcpcd.duid ];then  #a partition-common duid exists.
 	 	  [ ! -d /var/lib/dhcpcd ] && mkdir /var/lib/dhcpcd
-		  [ -s /mnt/home/.common.duid ] && cp /mnt/home/.common.duid /var/lib/dhcpcd/dhcpcd.duid || cp /root/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid  #use partition-common duid.
+		  [ -s /mnt/home/.common.duid ] && cp /mnt/home/.common.duid /var/lib/dhcpcd/dhcpcd.duid || cp ${HOME}/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid  #use partition-common duid.
 		 #else let dhcpcd use previously acquired duid or create new one
 		 fi
 		 dhcpcd -d $INTERFACE
@@ -978,7 +978,7 @@ setupDHCP()
 #end rerwin
 			HAS_ERROR=0
 #begin rerwin - Save copy of duid, if any, for use during reboot and as partition-common duid.
-			cp /var/lib/dhcpcd/dhcpcd.duid /root/.dhcpcd.duid 2>/dev/null
+			cp /var/lib/dhcpcd/dhcpcd.duid ${HOME}/.dhcpcd.duid 2>/dev/null
 			[ -d /mnt/home -a ! -s /mnt/home/.common.duid ] && cp /var/lib/dhcpcd/dhcpcd.duid /mnt/home/.common.duid 2>/dev/null
 #end rerwin
 		else
@@ -999,11 +999,11 @@ echo \"Trying to get IP address from DHCP server (60sec timeout)...\" > /dev/con
 rm /etc/dhcpc/dhcpcd-${INTERFACE}.pid 2>/dev/null #if left over from last session, causes trouble.
 rm /etc/dhcpc/dhcpcd-${INTERFACE}.cache 2>/dev/null #ditto
 rm /etc/dhcpc/dhcpcd-${INTERFACE}.info 2>/dev/null #ditto
-if [ ! -f /root/.dhcpcd.duid ];then
+if [ ! -f ${HOME}/.dhcpcd.duid ];then
  [ -d /etc/dhcpc ] && dhcpcd $INTERFACE || dhcpcd -I '' $INTERFACE
 else
  #[ ! -d /var/lib/dhcpcd ] && mkdir /var/lib/dhcpcd
- #[ -s /root/.dhcpcd.duid ] && cp /root/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid
+ #[ -s ${HOME}/.dhcpcd.duid ] && cp ${HOME}/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid
  dhcpcd $INTERFACE
 fi"   #Use default if indicated, or MAC address, as client ID.  #rerwin
   else
diff --git a/puppy-unleashed/packages/net_setup_retro-411/usr/local/net_setup/etc/rc.d/rc.network b/puppy-unleashed/packages/net_setup_retro-411/usr/local/net_setup/etc/rc.d/rc.network
index f2f4c2e..d0b227b 100755
--- a/puppy-unleashed/packages/net_setup_retro-411/usr/local/net_setup/etc/rc.d/rc.network
+++ b/puppy-unleashed/packages/net_setup_retro-411/usr/local/net_setup/etc/rc.d/rc.network
@@ -51,14 +51,14 @@ fi
 #fi
 
 #begin rerwin
-if [ -f /root/.dhcpcd.duid ];then  #Using a DUID in client ID
+if [ -f ${HOME}/.dhcpcd.duid ];then  #Using a DUID in client ID
  #If running from pup_save file and no common DHCP Unique Identifier (DUID) present and partition has a full-install or partition-save and a duid file, make that file the common duid.
- [ ! -s /mnt/home/.common.duid -a ! "`ls -l /mnt/home | cut -f 11 -d ' '`" = "/" -a -s /mnt/home/root/.dhcpcd.duid ] && cp /mnt/home/root/.dhcpcd.duid /mnt/home/.common.duid
+ [ ! -s /mnt/home/.common.duid -a ! "`ls -l /mnt/home | cut -f 11 -d ' '`" = "/" -a -s /mnt/home${HOME}/.dhcpcd.duid ] && cp /mnt/home${HOME}/.dhcpcd.duid /mnt/home/.common.duid
  #Ensure that any local duid matches the common duid or will force new duid.
- [ -s /mnt/home/.common.duid ] && cp /mnt/home/.common.duid /root/.dhcpcd.duid || cp /dev/null /root/.dhcpcd.duid
- if [ -s /root/.dhcpcd.duid ];then   #duid info for DHCP request.
+ [ -s /mnt/home/.common.duid ] && cp /mnt/home/.common.duid ${HOME}/.dhcpcd.duid || cp /dev/null ${HOME}/.dhcpcd.duid
+ if [ -s ${HOME}/.dhcpcd.duid ];then   #duid info for DHCP request.
   [ ! -d /var/lib/dhcpcd ] && mkdir /var/lib/dhcpcd
-  cp /root/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid
+  cp ${HOME}/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid
  else  #Force new DUID
   [ -f /var/lib/dhcpcd/dhcpcd.duid ] && rm /var/lib/dhcpcd/dhcpcd.duid
  fi
@@ -167,7 +167,7 @@ do
 
 #begin rerwin
      #Preset duid for dhcpcd, to use common  or local duid.
-     if [ -f /root/.dhcpcd.duid ];then   #duid client ID expected
+     if [ -f ${HOME}/.dhcpcd.duid ];then   #duid client ID expected
       dhcpcd ${INTERFACE}
      else
       [ -d /etc/dhcpc ] && dhcpcd ${INTERFACE} || dhcpcd -I '' ${INTERFACE}
@@ -179,8 +179,8 @@ do
 	    INTERFACEFAIL=1
      else
 #begin rerwin
-      if [ -f /root/.dhcpcd.duid ];then   #using a duid
-       [ -z `cat /root/.dhcpcd.duid` ] && cp /var/lib/dhcpcd/dhcpcd.duid /root/.dhcpcd.duid   #Save duid locally, if new.
+      if [ -f ${HOME}/.dhcpcd.duid ];then   #using a duid
+       [ -z `cat ${HOME}/.dhcpcd.duid` ] && cp /var/lib/dhcpcd/dhcpcd.duid ${HOME}/.dhcpcd.duid   #Save duid locally, if new.
       #If no common duid, save new duid as the partition-common duid.
        [ -d /mnt/home -a ! -s /mnt/home/.common.duid ] && cp /var/lib/dhcpcd/dhcpcd.duid /mnt/home/.common.duid
       fi
@@ -202,8 +202,8 @@ do
       ifconfig ${INTERFACE} down
      else
 #begin rerwin
-      if [ -f /root/.dhcpcd.duid ];then   #using a duid
-       [ -z `cat /root/.dhcpcd.duid` ] && cp /var/lib/dhcpcd/dhcpcd.duid /root/.dhcpcd.duid   #Save duid locally, if new.
+      if [ -f ${HOME}/.dhcpcd.duid ];then   #using a duid
+       [ -z `cat ${HOME}/.dhcpcd.duid` ] && cp /var/lib/dhcpcd/dhcpcd.duid ${HOME}/.dhcpcd.duid   #Save duid locally, if new.
       #If no common duid, save new duid as the partition-common duid.
        [ -d /mnt/home -a ! -s /mnt/home/.common.duid ] && cp /var/lib/dhcpcd/dhcpcd.duid /mnt/home/.common.duid
       fi
diff --git a/puppy-unleashed/packages/net_setup_retro-411/usr/local/net_setup/usr/sbin/ndiswrapperGUI.sh b/puppy-unleashed/packages/net_setup_retro-411/usr/local/net_setup/usr/sbin/ndiswrapperGUI.sh
index 1044c15..bb645c3 100755
--- a/puppy-unleashed/packages/net_setup_retro-411/usr/local/net_setup/usr/sbin/ndiswrapperGUI.sh
+++ b/puppy-unleashed/packages/net_setup_retro-411/usr/local/net_setup/usr/sbin/ndiswrapperGUI.sh
@@ -36,7 +36,7 @@ selectDriverFile()
 #=============================================================================
 showNdiswrapperGUI()
 {
-  CONFIG_DIR=/root/.config/ndiswrapperGUI
+  CONFIG_DIR=${HOME}/.config/ndiswrapperGUI
 
   mkdir -p $CONFIG_DIR
   PREV_LOCATION="`cat "$CONFIG_DIR/prev_location"`"
diff --git a/puppy-unleashed/packages/net_setup_retro-411/usr/local/net_setup/usr/sbin/net-setup.sh b/puppy-unleashed/packages/net_setup_retro-411/usr/local/net_setup/usr/sbin/net-setup.sh
index 4e9db7f..65e1253 100755
--- a/puppy-unleashed/packages/net_setup_retro-411/usr/local/net_setup/usr/sbin/net-setup.sh
+++ b/puppy-unleashed/packages/net_setup_retro-411/usr/local/net_setup/usr/sbin/net-setup.sh
@@ -78,7 +78,7 @@ showMainWindow()
 
 #begin rerwin
 		#Interpret client-option checkbox; allow duid only if supported.
-		[ "$CHKBOXDUID" = "true" ] && [ -d /var/lib/dhcpcd -o ! -d /etc/dhcpc ] && touch /root/.dhcpcd.duid || rm /root/.dhcpcd.duid 2> /dev/null   #rerwin
+		[ "$CHKBOXDUID" = "true" ] && [ -d /var/lib/dhcpcd -o ! -d /etc/dhcpc ] && touch ${HOME}/.dhcpcd.duid || rm ${HOME}/.dhcpcd.duid 2> /dev/null   #rerwin
 		[ -d /etc/dhcpc -a ! -d /var/lib/dhcpcd ] && CHECKDUID="false" || CHECKDUID=$CHKBOXDUID  #Update check-state in case user returns to main dialog - but force uncheck if running older dhcpcd.
 #end rerwin
 
@@ -217,7 +217,7 @@ To test or configure an interface, click on its button."  > /tmp/net-setup_MSGIN
  #${LOADEDETH}" > /tmp/net-setup_MSGMODULES.txt
 
 #Rerwin: Initialize Client-identification option.
-[ -f /root/.dhcpcd.duid ] && CHECKDUID="true" || CHECKDUID="false"   #rerwin
+[ -f ${HOME}/.dhcpcd.duid ] && CHECKDUID="true" || CHECKDUID="false"   #rerwin
 
 } # end refreshMainWindowInfo
 
@@ -984,10 +984,10 @@ setupDHCP()
 		sleep 5
 
 #begin rerwin - select type of client ID and set up for common duid for pup-save or within partition.
-		if [ -f /root/.dhcpcd.duid ];then  #Use default if indicated, or MAC address, as client ID
-		 if [ -s /mnt/home/.common.duid -o -s /root/.dhcpcd.duid ];then  #a partition-common duid exists.
+		if [ -f ${HOME}/.dhcpcd.duid ];then  #Use default if indicated, or MAC address, as client ID
+		 if [ -s /mnt/home/.common.duid -o -s ${HOME}/.dhcpcd.duid ];then  #a partition-common duid exists.
 	 	  [ ! -d /var/lib/dhcpcd ] && mkdir /var/lib/dhcpcd
-		  [ -s /mnt/home/.common.duid ] && cp /mnt/home/.common.duid /var/lib/dhcpcd/dhcpcd.duid || cp /root/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid  #use partition-common duid.
+		  [ -s /mnt/home/.common.duid ] && cp /mnt/home/.common.duid /var/lib/dhcpcd/dhcpcd.duid || cp ${HOME}/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid  #use partition-common duid.
 		 #else let dhcpcd use previously acquired duid or create new one
 		 fi
 		 dhcpcd -d $INTERFACE
@@ -999,7 +999,7 @@ setupDHCP()
 #end rerwin
 			HAS_ERROR=0
 #begin rerwin - Save copy of duid, if any, for use during reboot and as partition-common duid.
-			cp /var/lib/dhcpcd/dhcpcd.duid /root/.dhcpcd.duid 2>/dev/null
+			cp /var/lib/dhcpcd/dhcpcd.duid ${HOME}/.dhcpcd.duid 2>/dev/null
 			[ -d /mnt/home -a ! -s /mnt/home/.common.duid ] && cp /var/lib/dhcpcd/dhcpcd.duid /mnt/home/.common.duid 2>/dev/null
 #end rerwin
 		else
@@ -1020,11 +1020,11 @@ echo \"Trying to get IP address from DHCP server (60sec timeout)...\" > /dev/con
 rm /etc/dhcpc/dhcpcd-${INTERFACE}.pid 2>/dev/null #if left over from last session, causes trouble.
 rm /etc/dhcpc/dhcpcd-${INTERFACE}.cache 2>/dev/null #ditto
 rm /etc/dhcpc/dhcpcd-${INTERFACE}.info 2>/dev/null #ditto
-if [ ! -f /root/.dhcpcd.duid ];then
+if [ ! -f ${HOME}/.dhcpcd.duid ];then
  [ -d /etc/dhcpc ] && dhcpcd $INTERFACE || dhcpcd -I '' $INTERFACE
 else
  #[ ! -d /var/lib/dhcpcd ] && mkdir /var/lib/dhcpcd
- #[ -s /root/.dhcpcd.duid ] && cp /root/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid
+ #[ -s ${HOME}/.dhcpcd.duid ] && cp ${HOME}/.dhcpcd.duid /var/lib/dhcpcd/dhcpcd.duid
  dhcpcd $INTERFACE
 fi"   #Use default if indicated, or MAC address, as client ID.  #rerwin
   else
diff --git a/puppy-unleashed/packages/pbackup-3.1.4/usr/local/pbackup/pbackup b/puppy-unleashed/packages/pbackup-3.1.4/usr/local/pbackup/pbackup
index 1c88e0a..d6287d8 100755
--- a/puppy-unleashed/packages/pbackup-3.1.4/usr/local/pbackup/pbackup
+++ b/puppy-unleashed/packages/pbackup-3.1.4/usr/local/pbackup/pbackup
@@ -1928,7 +1928,7 @@ case "$1" in
 	fi
 	if [ `echo $CURRENT_VERSION  | sed -e s/^.*\=//g | tr -d "."` -lt 310 > /dev/null 2>&1 ]; then #Older than 3.1.0
 		sed -i -e "s/$CURRENT_VERSION/VERSION=$VERSION/g" $HOME/.pbackup/pbackuprc
-		rm /root/Startup/crond
+		rm ${HOME}/Startup/crond
 		cron_check
 	fi
 	if [ `echo $CURRENT_VERSION  | sed -e s/^.*\=//g | tr -d "."` -lt 314 > /dev/null 2>&1 ]; then #Older than 3.1.4
diff --git a/puppy-unleashed/packages/pbackup-3.1.5/usr/local/pbackup/pbackup b/puppy-unleashed/packages/pbackup-3.1.5/usr/local/pbackup/pbackup
index 1ad4b78..d24efe3 100755
--- a/puppy-unleashed/packages/pbackup-3.1.5/usr/local/pbackup/pbackup
+++ b/puppy-unleashed/packages/pbackup-3.1.5/usr/local/pbackup/pbackup
@@ -1938,7 +1938,7 @@ case "$1" in
 	fi
 	if [ `echo $CURRENT_VERSION  | sed -e s/^.*\=//g | tr -d "."` -lt 310 > /dev/null 2>&1 ]; then #Older than 3.1.0
 		sed -i -e "s/$CURRENT_VERSION/VERSION=$VERSION/g" $HOME/.pbackup/pbackuprc
-		rm /root/Startup/crond
+		rm ${HOME}/Startup/crond
 		cron_check
 	fi
 	if [ `echo $CURRENT_VERSION  | sed -e s/^.*\=//g | tr -d "."` -lt 315 > /dev/null 2>&1 ]; then #Older than 3.1.5
diff --git a/puppy-unleashed/packages/pfilesearch-1.11/usr/local/pfilesearch/locals/english b/puppy-unleashed/packages/pfilesearch-1.11/usr/local/pfilesearch/locals/english
index bce6bed..1a0cb90 100644
--- a/puppy-unleashed/packages/pfilesearch-1.11/usr/local/pfilesearch/locals/english
+++ b/puppy-unleashed/packages/pfilesearch-1.11/usr/local/pfilesearch/locals/english
@@ -64,7 +64,7 @@ LOC310="Searchpath"
 
 #info
 export LOC311="If wanted, there can be several searchpaths.
-Separate paths with <b>[OR]</b>: '/mnt/ [OR] /root/'.
+Separate paths with <b>[OR]</b>: '/mnt/ [OR] ${HOME}/'.
 './' is used to specify current path."
 export LOC312="- Searching for 'text in file' is MUCH slower than 'filename'.
 - Regular expressions works only when searching for filenames (not Text in file).
diff --git a/puppy-unleashed/packages/pfilesearch-1.4/usr/local/pfilesearch/locals/english b/puppy-unleashed/packages/pfilesearch-1.4/usr/local/pfilesearch/locals/english
index 3441b43..2d527ea 100644
--- a/puppy-unleashed/packages/pfilesearch-1.4/usr/local/pfilesearch/locals/english
+++ b/puppy-unleashed/packages/pfilesearch-1.4/usr/local/pfilesearch/locals/english
@@ -64,7 +64,7 @@ LOC310="Searchpath"
 
 #info
 export LOC311="If wanted, there can be several searchpaths.
-Separate paths with <b>[OR]</b>: '/mnt/ [OR] /root/'.
+Separate paths with <b>[OR]</b>: '/mnt/ [OR] ${HOME}/'.
 './' is used to specify current path."
 export LOC312="- Searching for 'text in file' is MUCH slower than 'filename'.
 - Regular expressions works only when searching for filenames (not Text in file).
diff --git a/puppy-unleashed/packages/pfilesearch-1.4/usr/local/pfilesearch/locals/italian b/puppy-unleashed/packages/pfilesearch-1.4/usr/local/pfilesearch/locals/italian
index 0309355..98e3e4c 100644
--- a/puppy-unleashed/packages/pfilesearch-1.4/usr/local/pfilesearch/locals/italian
+++ b/puppy-unleashed/packages/pfilesearch-1.4/usr/local/pfilesearch/locals/italian
@@ -64,7 +64,7 @@ LOC310="Percorso di ricerca"
 
 #info
 export LOC311="Se richiesto, vi possono essere più percorsi di ricerca.
-percorsi separati da <b>[OR]</b>: '/mnt/ [OR] /root/'.
+percorsi separati da <b>[OR]</b>: '/mnt/ [OR] ${HOME}/'.
 './' è usato per specificare il percorso corrente."
 export LOC312="- La ricerca 'testo in file' è molto più lenta della ricerca nel'nome file'.
 - Le espressioni regolari funzionano solo quando si effettua una ricerca per nome file (non testo in file).
diff --git a/puppy-unleashed/packages/pfilesearch-1.9/usr/local/pfilesearch/locals/english b/puppy-unleashed/packages/pfilesearch-1.9/usr/local/pfilesearch/locals/english
index bce6bed..1a0cb90 100644
--- a/puppy-unleashed/packages/pfilesearch-1.9/usr/local/pfilesearch/locals/english
+++ b/puppy-unleashed/packages/pfilesearch-1.9/usr/local/pfilesearch/locals/english
@@ -64,7 +64,7 @@ LOC310="Searchpath"
 
 #info
 export LOC311="If wanted, there can be several searchpaths.
-Separate paths with <b>[OR]</b>: '/mnt/ [OR] /root/'.
+Separate paths with <b>[OR]</b>: '/mnt/ [OR] ${HOME}/'.
 './' is used to specify current path."
 export LOC312="- Searching for 'text in file' is MUCH slower than 'filename'.
 - Regular expressions works only when searching for filenames (not Text in file).
diff --git a/puppy-unleashed/packages/pfind-3.4/usr/local/pfind/func b/puppy-unleashed/packages/pfind-3.4/usr/local/pfind/func
index 054deac..fdb5f4b 100755
--- a/puppy-unleashed/packages/pfind-3.4/usr/local/pfind/func
+++ b/puppy-unleashed/packages/pfind-3.4/usr/local/pfind/func
@@ -232,7 +232,7 @@ case $PROFILE in
  	<vbox>
  	 <frame $LOC614>
 	  <text><label>\"\"</label></text>
-	  <text><label>\"mv [FILE] /root/    -->    $LOC615 /root/\"</label></text>
+	  <text><label>\"mv [FILE] ${HOME}/    -->    $LOC615 ${HOME}/\"</label></text>
 	  <entry activates-default=\"true\"><variable>COMMAND</variable></entry>
 	  <text><label>\"\"</label></text>
 	 </frame>
diff --git a/puppy-unleashed/packages/pfind-4.4-1/usr/local/pfind/func b/puppy-unleashed/packages/pfind-4.4-1/usr/local/pfind/func
index 58e4d50..c48be2e 100755
--- a/puppy-unleashed/packages/pfind-4.4-1/usr/local/pfind/func
+++ b/puppy-unleashed/packages/pfind-4.4-1/usr/local/pfind/func
@@ -232,7 +232,7 @@ case $PROFILE in
  	<vbox>
  	 <frame $LOC614>
 	  <text><label>\"\"</label></text>
-	  <text><label>\"mv [FILE] /root/    -->    $LOC615 /root/\"</label></text>
+	  <text><label>\"mv [FILE] ${HOME}/    -->    $LOC615 ${HOME}/\"</label></text>
 	  <entry activates-default=\"true\"><variable>COMMAND</variable></entry>
 	  <text><label>\"\"</label></text>
 	 </frame>
diff --git a/puppy-unleashed/packages/pfind-4.4-1/usr/local/pfind/locals/english b/puppy-unleashed/packages/pfind-4.4-1/usr/local/pfind/locals/english
index 0788897..4ff57c8 100644
--- a/puppy-unleashed/packages/pfind-4.4-1/usr/local/pfind/locals/english
+++ b/puppy-unleashed/packages/pfind-4.4-1/usr/local/pfind/locals/english
@@ -132,7 +132,7 @@ LOC617="Search result contains file(s) with < or > in name. As long as all filen
 LOC618="items in list.|See menuitem 'configure'."
 LOC619="Restart Pfind to activate new language."
 LOC620="Filenames in searchresult can be shown in 3 different ways:
-<b>Short</b> - Just filename (file.txt). Similar files (/tmp/file.txt and /root/file.txt) will be (file.txt) and (file~.txt).
+<b>Short</b> - Just filename (file.txt). Similar files (/tmp/file.txt and ${HOME}/file.txt) will be (file.txt) and (file~.txt).
 <b>Long</b> - Filename with path (-tmp-file.txt). Never similar files.
 <b>Hybrid</b> - As 'short', but 'long' when similar files."
 
diff --git a/puppy-unleashed/packages/pfind-4.4-1/usr/local/pfind/pfindhlp b/puppy-unleashed/packages/pfind-4.4-1/usr/local/pfind/pfindhlp
index bf345ec..a1a2abd 100755
--- a/puppy-unleashed/packages/pfind-4.4-1/usr/local/pfind/pfindhlp
+++ b/puppy-unleashed/packages/pfind-4.4-1/usr/local/pfind/pfindhlp
@@ -1,9 +1,9 @@
 
 export HLPTXT1="If wanted, there can be several searchpaths.
-Separate paths with [OR]: '/mnt/ [OR] /root/'.
+Separate paths with [OR]: '/mnt/ [OR] ${HOME}/'.
 './' is used to specify current path."
 export HLPTXT2="Filenames in searchresult can be shown in 3 different ways:
-<b>short</b> -  Just filename (file.txt). Similar files (/tmp/file.txt and /root/file.txt) will be (file.txt) and (file~.txt).
+<b>short</b> -  Just filename (file.txt). Similar files (/tmp/file.txt and ${HOME}/file.txt) will be (file.txt) and (file~.txt).
 <b>long</b> -   Filename with path (-tmp-file.txt). Never similar files.
 <b>hybrid</b> - As 'short', but 'long' when similar files."
 export HLPTXT3="- Searching for 'text in file' is MUCH slower than 'filename'.
diff --git a/puppy-unleashed/packages/pfind-4.7/usr/local/pfind/func b/puppy-unleashed/packages/pfind-4.7/usr/local/pfind/func
index 66a7906..36bd5d2 100755
--- a/puppy-unleashed/packages/pfind-4.7/usr/local/pfind/func
+++ b/puppy-unleashed/packages/pfind-4.7/usr/local/pfind/func
@@ -242,7 +242,7 @@ case $PROFILE in
  	<vbox>
  	 <frame $LOC614>
 	  <text><label>\"\"</label></text>
-	  <text><label>\"mv [FILE] /root/    -->    $LOC615 /root/\"</label></text>
+	  <text><label>\"mv [FILE] ${HOME}/    -->    $LOC615 ${HOME}/\"</label></text>
 	  <entry activates-default=\"true\"><variable>COMMAND</variable></entry>
 	  <text><label>\"\"</label></text>
 	 </frame>
diff --git a/puppy-unleashed/packages/pfind-4.7/usr/local/pfind/locals/english b/puppy-unleashed/packages/pfind-4.7/usr/local/pfind/locals/english
index 0788897..4ff57c8 100644
--- a/puppy-unleashed/packages/pfind-4.7/usr/local/pfind/locals/english
+++ b/puppy-unleashed/packages/pfind-4.7/usr/local/pfind/locals/english
@@ -132,7 +132,7 @@ LOC617="Search result contains file(s) with < or > in name. As long as all filen
 LOC618="items in list.|See menuitem 'configure'."
 LOC619="Restart Pfind to activate new language."
 LOC620="Filenames in searchresult can be shown in 3 different ways:
-<b>Short</b> - Just filename (file.txt). Similar files (/tmp/file.txt and /root/file.txt) will be (file.txt) and (file~.txt).
+<b>Short</b> - Just filename (file.txt). Similar files (/tmp/file.txt and ${HOME}/file.txt) will be (file.txt) and (file~.txt).
 <b>Long</b> - Filename with path (-tmp-file.txt). Never similar files.
 <b>Hybrid</b> - As 'short', but 'long' when similar files."
 
diff --git a/puppy-unleashed/packages/pfind-4.7/usr/local/pfind/pfindhlp b/puppy-unleashed/packages/pfind-4.7/usr/local/pfind/pfindhlp
index bf345ec..a1a2abd 100755
--- a/puppy-unleashed/packages/pfind-4.7/usr/local/pfind/pfindhlp
+++ b/puppy-unleashed/packages/pfind-4.7/usr/local/pfind/pfindhlp
@@ -1,9 +1,9 @@
 
 export HLPTXT1="If wanted, there can be several searchpaths.
-Separate paths with [OR]: '/mnt/ [OR] /root/'.
+Separate paths with [OR]: '/mnt/ [OR] ${HOME}/'.
 './' is used to specify current path."
 export HLPTXT2="Filenames in searchresult can be shown in 3 different ways:
-<b>short</b> -  Just filename (file.txt). Similar files (/tmp/file.txt and /root/file.txt) will be (file.txt) and (file~.txt).
+<b>short</b> -  Just filename (file.txt). Similar files (/tmp/file.txt and ${HOME}/file.txt) will be (file.txt) and (file~.txt).
 <b>long</b> -   Filename with path (-tmp-file.txt). Never similar files.
 <b>hybrid</b> - As 'short', but 'long' when similar files."
 export HLPTXT3="- Searching for 'text in file' is MUCH slower than 'filename'.
diff --git a/puppy-unleashed/packages/pupdvdtool-0.8/usr/local/apps/pupdvdtool/audiogui b/puppy-unleashed/packages/pupdvdtool-0.8/usr/local/apps/pupdvdtool/audiogui
index 15247d7..38b219d 100755
--- a/puppy-unleashed/packages/pupdvdtool-0.8/usr/local/apps/pupdvdtool/audiogui
+++ b/puppy-unleashed/packages/pupdvdtool-0.8/usr/local/apps/pupdvdtool/audiogui
@@ -198,7 +198,7 @@ AUDIODIR="/"
 fi
 AUDIODIR=`cat $HOME/.pupdvdtool/audiodir`
 DIR2=`Xdialog --title "Select your save directory" --dselect "$AUDIODIR" 0 0 2>&1`
-echo "$DIR2" > /root/.pupdvdtool/audiodir
+echo "$DIR2" > ${HOME}/.pupdvdtool/audiodir
 if [ "$?" != 0 ]; then pupdvdtool; exit 0; fi
 fi
 
diff --git a/puppy-unleashed/packages/pupdvdtool-0.8/usr/local/apps/pupdvdtool/pupdvdtool b/puppy-unleashed/packages/pupdvdtool-0.8/usr/local/apps/pupdvdtool/pupdvdtool
index 1091792..0e95626 100755
--- a/puppy-unleashed/packages/pupdvdtool-0.8/usr/local/apps/pupdvdtool/pupdvdtool
+++ b/puppy-unleashed/packages/pupdvdtool-0.8/usr/local/apps/pupdvdtool/pupdvdtool
@@ -14,7 +14,7 @@ fi
 BASE=`getdir $0`
 cd "$BASE"
 
-### the next step converts ./ to a full path like /root/test
+### the next step converts ./ to a full path like ${HOME}/test
 
 BASE=`pwd`
 cd "$BASE"
diff --git a/puppy-unleashed/packages/puppy-podcast-grabber-1.1/usr/local/ppg/ppg.sh b/puppy-unleashed/packages/puppy-podcast-grabber-1.1/usr/local/ppg/ppg.sh
index 1f843a8..b7ca2a3 100755
--- a/puppy-unleashed/packages/puppy-podcast-grabber-1.1/usr/local/ppg/ppg.sh
+++ b/puppy-unleashed/packages/puppy-podcast-grabber-1.1/usr/local/ppg/ppg.sh
@@ -46,7 +46,7 @@ serverlist="${maindir}serverlist.txt"
 gonefile="./.gone"
 
 # change this to where you would like the files to be saved
-outputdir="/root/my-documents/Podcasts"
+outputdir="${HOME}/my-documents/Podcasts"
 if [ ! -e "${outputdir}" ]; then
 	mkdir "${outputdir}"
 fi
diff --git a/puppy-unleashed/packages/pure_ftpd-1.0.22-2/usr/sbin/run-pureftpd b/puppy-unleashed/packages/pure_ftpd-1.0.22-2/usr/sbin/run-pureftpd
index 13b1fe4..bcc9be2 100755
--- a/puppy-unleashed/packages/pure_ftpd-1.0.22-2/usr/sbin/run-pureftpd
+++ b/puppy-unleashed/packages/pure_ftpd-1.0.22-2/usr/sbin/run-pureftpd
@@ -26,7 +26,7 @@ vMsgH=15 ; vMsg=''
 		
 pure-ftpd -bBADHk 90 $cfg
  
-Xdialog --wmclass "pure-ftpd" --title "Start/Stop PureFTPD" --stdout --ok-label "OK" --infobox "Pure-ftpd is started. \n If you allowed anonymous connections, web browsers will connect as user ftp. \n User ftp's home directory is at /root/ftpd. \n If you allowed root logins you should set a root password. \n To set a password for root, open a terminal and type passwd. \n To stop the server run this script again." 0 0 90000
+Xdialog --wmclass "pure-ftpd" --title "Start/Stop PureFTPD" --stdout --ok-label "OK" --infobox "Pure-ftpd is started. \n If you allowed anonymous connections, web browsers will connect as user ftp. \n User ftp's home directory is at ${HOME}/ftpd. \n If you allowed root logins you should set a root password. \n To set a password for root, open a terminal and type passwd. \n To stop the server run this script again." 0 0 90000
 
 
  
\ No newline at end of file
diff --git a/puppy-unleashed/packages/pwidgets-1.9-10/usr/local/pwidgets/func b/puppy-unleashed/packages/pwidgets-1.9-10/usr/local/pwidgets/func
index ba565dc..aef9932 100755
--- a/puppy-unleashed/packages/pwidgets-1.9-10/usr/local/pwidgets/func
+++ b/puppy-unleashed/packages/pwidgets-1.9-10/usr/local/pwidgets/func
@@ -92,7 +92,7 @@ case "$1" in
 				IMAGE="`grep IMAGE= $HOME/.pwidgets/configs/Clock-analog | cut -d '=' -f 2`"
 				echo "xonclock --position=$POS_XONCLOCK --offset-v=$OFFSET_Y --offset-h=$OFFSET_X --use-background --skin=$IMAGE --color-hour=$CLOCK_COLOR_HOUR --color-minute=$CLOCK_COLOR_MINUTE --color-second=$CLOCK_COLOR_SECOND &" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
 				echo "sleep $CLOCK_SLEEP" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
-				echo "rox -p /root/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
+				echo "rox -p ${HOME}/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
 				;;
 			"Slideshow")
 				. $HOME/.pwidgets/configs/Slideshow
@@ -152,7 +152,7 @@ case "$1" in
 	while read TREE_WIDGET; do
 		if [ ! "`grep rox $HOME/.pwidgets/tmp/pwidgets-exec_xonclock`" ] && [ "$TREE_WIDGET" = "Tv" ]; then
 			echo "sleep $CLOCK_SLEEP" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
-			echo "rox -p /root/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
+			echo "rox -p ${HOME}/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
 		fi
 	done < $HOME/.pwidgets/tmp/pwidgets_list
 	#Update theme
diff --git a/puppy-unleashed/packages/pwidgets-1.9-6/usr/local/pwidgets/func b/puppy-unleashed/packages/pwidgets-1.9-6/usr/local/pwidgets/func
index 71f18af..4cf80d7 100755
--- a/puppy-unleashed/packages/pwidgets-1.9-6/usr/local/pwidgets/func
+++ b/puppy-unleashed/packages/pwidgets-1.9-6/usr/local/pwidgets/func
@@ -102,7 +102,7 @@ case "$1" in
 				IMAGE="`grep IMAGE= $HOME/.pwidgets/configs/Clock-analog | cut -d '=' -f 2`"
 				echo "xonclock --position=$POS_XONCLOCK --offset-v=$OFFSET_Y --offset-h=$OFFSET_X --use-background --skin=$IMAGE --color-hour=$CLOCK_COLOR_HOUR --color-minute=$CLOCK_COLOR_MINUTE --color-second=$CLOCK_COLOR_SECOND &" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
 				echo "sleep $CLOCK_SLEEP" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
-				echo "rox -p /root/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
+				echo "rox -p ${HOME}/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
 				;;
 			"Slideshow")
 				. $HOME/.pwidgets/configs/Slideshow
@@ -162,7 +162,7 @@ case "$1" in
 	while read TREE_WIDGET; do
 		if [ ! "`grep rox $HOME/.pwidgets/tmp/pwidgets-exec_xonclock`" ] && [ "$TREE_WIDGET" = "Tv" ]; then
 			echo "sleep $CLOCK_SLEEP" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
-			echo "rox -p /root/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
+			echo "rox -p ${HOME}/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
 		fi
 	done < $HOME/.pwidgets/tmp/pwidgets_list
 	#Update theme
diff --git a/puppy-unleashed/packages/pwidgets-2.0.6-4/usr/local/pwidgets/func b/puppy-unleashed/packages/pwidgets-2.0.6-4/usr/local/pwidgets/func
index 378efbc..2730c72 100755
--- a/puppy-unleashed/packages/pwidgets-2.0.6-4/usr/local/pwidgets/func
+++ b/puppy-unleashed/packages/pwidgets-2.0.6-4/usr/local/pwidgets/func
@@ -150,7 +150,7 @@ case "$1" in
 				echo "ROX_DESKTOP=\`xwininfo -root -tree | grep 'ROX-Pinboard' | tr -s ' ' | cut -d ' ' -f 2\`" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
 				echo "xonclock --position=$POS_XONCLOCK --offset-v=$OFFSET_Y --offset-h=$OFFSET_X --window-id="'$ROX_DESKTOP'" --use-background --skin=$IMAGE --color-hour=$CLOCK_COLOR_HOUR --color-minute=$CLOCK_COLOR_MINUTE --color-second=$CLOCK_COLOR_SECOND &" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
 #				echo "sleep $CLOCK_SLEEP" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
-#				echo "rox -p /root/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
+#				echo "rox -p ${HOME}/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
 				;;
 			"Slideshow")
 				. $HOME/.pwidgets/configs/Slideshow
@@ -209,7 +209,7 @@ case "$1" in
 #	#update ROX pinboard for TV if xonclock is NOT active
 #	if [ ! "`grep rox $HOME/.pwidgets/tmp/pwidgets-exec_xonclock`" ] && [ "$TREE_WIDGET" = "Tv" ]; then
 #		echo "sleep $CLOCK_SLEEP" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
-#		echo "rox -p /root/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
+#		echo "rox -p ${HOME}/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
 #	fi
 	#Update theme
 	[ "`cat $HOME/.pwidgets/tmp/pwidgets-active_theme`" != "$THEME" ] && . $APPDIR/func -set_theme
diff --git a/puppy-unleashed/packages/pwidgets-2.0.8/usr/local/pwidgets/func b/puppy-unleashed/packages/pwidgets-2.0.8/usr/local/pwidgets/func
index 378efbc..2730c72 100755
--- a/puppy-unleashed/packages/pwidgets-2.0.8/usr/local/pwidgets/func
+++ b/puppy-unleashed/packages/pwidgets-2.0.8/usr/local/pwidgets/func
@@ -150,7 +150,7 @@ case "$1" in
 				echo "ROX_DESKTOP=\`xwininfo -root -tree | grep 'ROX-Pinboard' | tr -s ' ' | cut -d ' ' -f 2\`" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
 				echo "xonclock --position=$POS_XONCLOCK --offset-v=$OFFSET_Y --offset-h=$OFFSET_X --window-id="'$ROX_DESKTOP'" --use-background --skin=$IMAGE --color-hour=$CLOCK_COLOR_HOUR --color-minute=$CLOCK_COLOR_MINUTE --color-second=$CLOCK_COLOR_SECOND &" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
 #				echo "sleep $CLOCK_SLEEP" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
-#				echo "rox -p /root/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
+#				echo "rox -p ${HOME}/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
 				;;
 			"Slideshow")
 				. $HOME/.pwidgets/configs/Slideshow
@@ -209,7 +209,7 @@ case "$1" in
 #	#update ROX pinboard for TV if xonclock is NOT active
 #	if [ ! "`grep rox $HOME/.pwidgets/tmp/pwidgets-exec_xonclock`" ] && [ "$TREE_WIDGET" = "Tv" ]; then
 #		echo "sleep $CLOCK_SLEEP" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
-#		echo "rox -p /root/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
+#		echo "rox -p ${HOME}/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
 #	fi
 	#Update theme
 	[ "`cat $HOME/.pwidgets/tmp/pwidgets-active_theme`" != "$THEME" ] && . $APPDIR/func -set_theme
diff --git a/puppy-unleashed/packages/pwidgets-2.0/usr/local/pwidgets/func b/puppy-unleashed/packages/pwidgets-2.0/usr/local/pwidgets/func
index e93733a..b5c4784 100755
--- a/puppy-unleashed/packages/pwidgets-2.0/usr/local/pwidgets/func
+++ b/puppy-unleashed/packages/pwidgets-2.0/usr/local/pwidgets/func
@@ -149,7 +149,7 @@ case "$1" in
 				IMAGE="`grep IMAGE= $HOME/.pwidgets/configs/Clock_analog | cut -d '=' -f 2`"
 				echo "xonclock --position=$POS_XONCLOCK --offset-v=$OFFSET_Y --offset-h=$OFFSET_X --use-background --skin=$IMAGE --color-hour=$CLOCK_COLOR_HOUR --color-minute=$CLOCK_COLOR_MINUTE --color-second=$CLOCK_COLOR_SECOND &" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
 				echo "sleep $CLOCK_SLEEP" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
-				echo "rox -p /root/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
+				echo "rox -p ${HOME}/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xonclock
 				;;
 			"Slideshow")
 				. $HOME/.pwidgets/configs/Slideshow
@@ -208,7 +208,7 @@ case "$1" in
 	#update ROX pinboard for TV if xonclock is NOT active
 	if [ ! "`grep rox $HOME/.pwidgets/tmp/pwidgets-exec_xonclock`" ] && [ "$TREE_WIDGET" = "Tv" ]; then
 		echo "sleep $CLOCK_SLEEP" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
-		echo "rox -p /root/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
+		echo "rox -p ${HOME}/Choices/ROX-Filer/PuppyPin" >> $HOME/.pwidgets/tmp/pwidgets-exec_xwinwrap
 	fi
 	#Update theme
 	[ "`cat $HOME/.pwidgets/tmp/pwidgets-active_theme`" != "$THEME" ] && . $APPDIR/func -set_theme
diff --git a/puppy-unleashed/packages/pwireless-0.8.3/usr/sbin/Pwireless b/puppy-unleashed/packages/pwireless-0.8.3/usr/sbin/Pwireless
index 81aabc9..ece7eaf 100755
--- a/puppy-unleashed/packages/pwireless-0.8.3/usr/sbin/Pwireless
+++ b/puppy-unleashed/packages/pwireless-0.8.3/usr/sbin/Pwireless
@@ -29,7 +29,7 @@ case \"\$2\" in
 	;;
 esac
 
-eval \`cat /root/.config/Pwireless/\$1\`
+eval \`cat ${HOME}/.config/Pwireless/\$1\`
 PROFILE_TITLE=\"\$1\"
 PROFILE_ESSID=\"\$ESSID\"
 PROFILE_MODE=\"managed\"
diff --git a/puppy-unleashed/packages/tcl-8.5.6-v1/usr/lib/tclConfig.sh b/puppy-unleashed/packages/tcl-8.5.6-v1/usr/lib/tclConfig.sh
index 85db97d..698ac4e 100644
--- a/puppy-unleashed/packages/tcl-8.5.6-v1/usr/lib/tclConfig.sh
+++ b/puppy-unleashed/packages/tcl-8.5.6-v1/usr/lib/tclConfig.sh
@@ -111,7 +111,7 @@ TCL_LIB_FLAG='-ltcl8.5'
 
 # String to pass to linker to pick up the Tcl library from its
 # build directory.
-TCL_BUILD_LIB_SPEC='-L/root/src/tcl8.5.6/unix -ltcl8.5'
+TCL_BUILD_LIB_SPEC='-L${HOME}/src/tcl8.5.6/unix -ltcl8.5'
 
 # String to pass to linker to pick up the Tcl library from its
 # installed directory.
@@ -146,7 +146,7 @@ TCL_UNSHARED_LIB_SUFFIX='${VERSION}.a'
 # different place than the directory containing the source files, this
 # points to the location of the sources, not the location where Tcl was
 # compiled.
-TCL_SRC_DIR='/root/src/tcl8.5.6'
+TCL_SRC_DIR='${HOME}/src/tcl8.5.6'
 
 # List of standard directories in which to look for packages during
 # "package require" commands.  Contains the "prefix" directory plus also
@@ -164,14 +164,14 @@ TCL_STUB_LIB_FLAG='-ltclstub8.5'
 
 # String to pass to linker to pick up the Tcl stub library from its
 # build directory.
-TCL_BUILD_STUB_LIB_SPEC='-L/root/src/tcl8.5.6/unix -ltclstub8.5'
+TCL_BUILD_STUB_LIB_SPEC='-L${HOME}/src/tcl8.5.6/unix -ltclstub8.5'
 
 # String to pass to linker to pick up the Tcl stub library from its
 # installed directory.
 TCL_STUB_LIB_SPEC='-L/usr/lib -ltclstub8.5'
 
 # Path to the Tcl stub library in the build directory.
-TCL_BUILD_STUB_LIB_PATH='/root/src/tcl8.5.6/unix/libtclstub8.5.a'
+TCL_BUILD_STUB_LIB_PATH='${HOME}/src/tcl8.5.6/unix/libtclstub8.5.a'
 
 # Path to the Tcl stub library in the install directory.
 TCL_STUB_LIB_PATH='/usr/lib/libtclstub8.5.a'
diff --git a/puppy-unleashed/packages/tcl-8.5.6/usr/lib/tclConfig.sh b/puppy-unleashed/packages/tcl-8.5.6/usr/lib/tclConfig.sh
index 85db97d..698ac4e 100644
--- a/puppy-unleashed/packages/tcl-8.5.6/usr/lib/tclConfig.sh
+++ b/puppy-unleashed/packages/tcl-8.5.6/usr/lib/tclConfig.sh
@@ -111,7 +111,7 @@ TCL_LIB_FLAG='-ltcl8.5'
 
 # String to pass to linker to pick up the Tcl library from its
 # build directory.
-TCL_BUILD_LIB_SPEC='-L/root/src/tcl8.5.6/unix -ltcl8.5'
+TCL_BUILD_LIB_SPEC='-L${HOME}/src/tcl8.5.6/unix -ltcl8.5'
 
 # String to pass to linker to pick up the Tcl library from its
 # installed directory.
@@ -146,7 +146,7 @@ TCL_UNSHARED_LIB_SUFFIX='${VERSION}.a'
 # different place than the directory containing the source files, this
 # points to the location of the sources, not the location where Tcl was
 # compiled.
-TCL_SRC_DIR='/root/src/tcl8.5.6'
+TCL_SRC_DIR='${HOME}/src/tcl8.5.6'
 
 # List of standard directories in which to look for packages during
 # "package require" commands.  Contains the "prefix" directory plus also
@@ -164,14 +164,14 @@ TCL_STUB_LIB_FLAG='-ltclstub8.5'
 
 # String to pass to linker to pick up the Tcl stub library from its
 # build directory.
-TCL_BUILD_STUB_LIB_SPEC='-L/root/src/tcl8.5.6/unix -ltclstub8.5'
+TCL_BUILD_STUB_LIB_SPEC='-L${HOME}/src/tcl8.5.6/unix -ltclstub8.5'
 
 # String to pass to linker to pick up the Tcl stub library from its
 # installed directory.
 TCL_STUB_LIB_SPEC='-L/usr/lib -ltclstub8.5'
 
 # Path to the Tcl stub library in the build directory.
-TCL_BUILD_STUB_LIB_PATH='/root/src/tcl8.5.6/unix/libtclstub8.5.a'
+TCL_BUILD_STUB_LIB_PATH='${HOME}/src/tcl8.5.6/unix/libtclstub8.5.a'
 
 # Path to the Tcl stub library in the install directory.
 TCL_STUB_LIB_PATH='/usr/lib/libtclstub8.5.a'
diff --git a/puppy-unleashed/packages/tk-8.5.6/usr/lib/tkConfig.sh b/puppy-unleashed/packages/tk-8.5.6/usr/lib/tkConfig.sh
index 5d72d80..931ceb5 100644
--- a/puppy-unleashed/packages/tk-8.5.6/usr/lib/tkConfig.sh
+++ b/puppy-unleashed/packages/tk-8.5.6/usr/lib/tkConfig.sh
@@ -55,7 +55,7 @@ TK_LIB_FLAG='-ltk8.5'
 
 # String to pass to linker to pick up the Tk library from its
 # build directory.
-TK_BUILD_LIB_SPEC='-L/root/src/tk8.5.6/unix -ltk8.5'
+TK_BUILD_LIB_SPEC='-L${HOME}/src/tk8.5.6/unix -ltk8.5'
 
 # String to pass to linker to pick up the Tk library from its
 # installed directory.
@@ -71,7 +71,7 @@ TK_INCLUDE_SPEC='-I/usr/include'
 # different place than the directory containing the source files, this
 # points to the location of the sources, not the location where Tk was
 # compiled.
-TK_SRC_DIR='/root/src/tk8.5.6'
+TK_SRC_DIR='${HOME}/src/tk8.5.6'
 
 # Needed if you want to make a 'fat' shared library library
 # containing tk objects or link a different wish.
@@ -86,14 +86,14 @@ TK_STUB_LIB_FLAG='-ltkstub8.5'
 
 # String to pass to linker to pick up the Tk stub library from its
 # build directory.
-TK_BUILD_STUB_LIB_SPEC='-L/root/src/tk8.5.6/unix -ltkstub8.5'
+TK_BUILD_STUB_LIB_SPEC='-L${HOME}/src/tk8.5.6/unix -ltkstub8.5'
 
 # String to pass to linker to pick up the Tk stub library from its
 # installed directory.
 TK_STUB_LIB_SPEC='-L/usr/lib -ltkstub8.5'
 
 # Path to the Tk stub library in the build directory.
-TK_BUILD_STUB_LIB_PATH='/root/src/tk8.5.6/unix/libtkstub8.5.a'
+TK_BUILD_STUB_LIB_PATH='${HOME}/src/tk8.5.6/unix/libtkstub8.5.a'
 
 # Path to the Tk stub library in the install directory.
 TK_STUB_LIB_PATH='/usr/lib/libtkstub8.5.a'
diff --git a/puppy-unleashed/packages/xdg_puppy-0.7.6-5_4.2/usr/sbin/icon_switcher b/puppy-unleashed/packages/xdg_puppy-0.7.6-5_4.2/usr/sbin/icon_switcher
index 66592df..da68d41 100755
--- a/puppy-unleashed/packages/xdg_puppy-0.7.6-5_4.2/usr/sbin/icon_switcher
+++ b/puppy-unleashed/packages/xdg_puppy-0.7.6-5_4.2/usr/sbin/icon_switcher
@@ -117,7 +117,7 @@ Click OK button and you will see them...\"</label></text>
 </window>"
  gtkdialog3 --program=ENDGUI
 
- rox -p=/root/Choices/ROX-Filer/PuppyPin
+ rox -p=${HOME}/Choices/ROX-Filer/PuppyPin
  fixwidgets &
  jwm -restart
 
