diff --git a/apps/WACUP (new WinAmp)/uninstall b/apps/WACUP (new WinAmp)/uninstall
index ef220ff..25dae00 100755
--- a/apps/WACUP (new WinAmp)/uninstall	
+++ b/apps/WACUP (new WinAmp)/uninstall	
@@ -9,4 +9,4 @@ function error {
 
 echo -e "\e[30m\e[107mClick Yes to uninstall WACUP\e[0m"
 
-BOX86_NOBANNER=1 wine '/home/pi/.wine/drive_c/Program Files/WACUP/UninstWACUP.exe'
+BOX86_NOBANNER=1 wine ~/'.wine/drive_c/Program Files/WACUP/UninstWACUP.exe'
diff --git a/etc/categoryedit b/etc/categoryedit
index 4814e44..49c9440 100755
--- a/etc/categoryedit
+++ b/etc/categoryedit
@@ -68,7 +68,7 @@ $category
   #echo -e "'$LIST'\n'$APPS'"
   
   output="$(echo -e "$LIST" | yad --center --title='Category editor' --height=400 \
-    --list --text="Category file: $(echo "${DIRECTORY}/data/categories/structure" | sed 's+/home/pi+~+g')" --editable --editable-cols=3 --multiple --dclick-action=true --print-all \
+    --list --text="Category file: $(echo "${DIRECTORY}/data/categories/structure" | sed "s+$HOME+~+g")" --editable --editable-cols=3 --multiple --dclick-action=true --print-all \
     --separator='|' --window-icon="${DIRECTORY}/icons/logo.png" \
     --column=:IMG --column=Name --column=Category:TEXT \
     --button=Reset!"${DIRECTORY}/icons/backup.png"!"Overwrites your structure file with the default one from the Pi-Apps repository.":4 \
diff --git a/preload b/preload
index 12c384b..3293a12 100755
--- a/preload
+++ b/preload
@@ -91,7 +91,7 @@ fi
 if [ $reloadlist == 1 ];then
   echo "Generating list..." 1>&2
   
-  source /home/pi/pi-apps/api
+  source "${DIRECTORY}/api"
   vfiles="$(app_categories)"
   
   #generate a virtual file system with apps in folders represented as subdirectories