diff --git a/apps/Arduino/install-32 b/apps/Arduino/install-32
index 5afddfc..af05aa1 100755
--- a/apps/Arduino/install-32
+++ b/apps/Arduino/install-32
@@ -13,6 +13,6 @@ tar -xf arduino-1.8.13-linuxarm.tar.xz || error "failed to extract with tar!"
 arduino-1.8.13/install.sh || error "failed to run install as non-root user!"
 sudo arduino-1.8.13/install.sh || error "failed run install as root user!"
 
-rm /home/pi/Desktop/arduino-arduinoide.desktop || error "failed delete desktop shortcut!"
+rm $HOME/Desktop/arduino-arduinoide.desktop
 rm arduino-1.8.13-linuxarm.tar.xz
 exit 0
diff --git a/apps/Arduino/install-64 b/apps/Arduino/install-64
index 965ee4b..3242565 100755
--- a/apps/Arduino/install-64
+++ b/apps/Arduino/install-64
@@ -13,6 +13,6 @@ tar -xf arduino-1.8.13-linuxaarch64.tar.xz || error "failed to extract with tar!
 arduino-1.8.13/install.sh || error "failed to run install as non-root user!"
 sudo arduino-1.8.13/install.sh || error "failed run install as root user!"
 
-rm /home/pi/Desktop/arduino-arduinoide.desktop || error "failed delete desktop shortcut!"
+rm $HOME/Desktop/arduino-arduinoide.desktop
 rm arduino-1.8.13-linuxaarch64.tar.xz
 exit 0
diff --git a/apps/CommanderPi/install b/apps/CommanderPi/install
index fdbf9ea..c7231ca 100755
--- a/apps/CommanderPi/install
+++ b/apps/CommanderPi/install
@@ -11,6 +11,6 @@ function error {
 "${DIRECTORY}/pkg-install" "python3-tk python3-pil python3-pil.imagetk" "$(dirname "$0")" || exit 1
 
 git clone https://github.com/Jack477/CommanderPi || error "failed to download repository!"
-cd /home/pi/CommanderPi || error "failed to enter repository!"
+cd CommanderPi || error "failed to enter repository!"
 chmod +x install.sh || error "failed to mark install.sh as executable!"
 ./install.sh || error "failed to run install.sh!"
diff --git a/apps/CommanderPi/uninstall b/apps/CommanderPi/uninstall
index c69e375..f04c6f9 100755
--- a/apps/CommanderPi/uninstall
+++ b/apps/CommanderPi/uninstall
@@ -9,4 +9,4 @@ function error {
 "${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1
 
 rm -rf ~/CommanderPi || error "failed to remove commanderpi folder!"
-sudo rm -f /usr/share/applications/commanderpi.desktop /home/pi/Desktop/commanderpi.desktop || error "failed to remove menu button!"
\ No newline at end of file
+sudo rm -f /usr/share/applications/commanderpi.desktop ~/Desktop/commanderpi.desktop || error "failed to remove menu button!"
\ No newline at end of file
diff --git a/apps/Cool Retro Term/install b/apps/Cool Retro Term/install
index 310e031..c862a5c 100755
--- a/apps/Cool Retro Term/install	
+++ b/apps/Cool Retro Term/install	
@@ -21,12 +21,12 @@ cp -rf qmltermwidget/src/qmldir qmltermwidget/lib/kb-layouts qmltermwidget/lib/c
 
 echo "[Desktop Entry]
 Comment=Use the command line the old way
-Exec=/home/pi/cool-retro-term/cool-retro-term
+Exec=$HOME/cool-retro-term/cool-retro-term
 GenericName=Terminal emulator
-Icon=/home/pi/cool-retro-term/app/icons/64x64/cool-retro-term.png
+Icon=$HOME/cool-retro-term/app/icons/64x64/cool-retro-term.png
 Name=Cool Retro Term
 Categories=GTK;System;TerminalEmulator;
 StartupNotify=true
 Terminal=false
 Type=Application
-Keywords=shell;prompt;command;commandline;console;command line;execute;" >> /home/pi/.local/share/applications/crt.desktop
+Keywords=shell;prompt;command;commandline;console;command line;execute;" > ~/.local/share/applications/crt.desktop
diff --git a/apps/Discord/install-32 b/apps/Discord/install-32
index b3ea742..76a5bc2 100755
--- a/apps/Discord/install-32
+++ b/apps/Discord/install-32
@@ -28,7 +28,7 @@ Type=Application
 Name=Discord
 Path=$HOME/discord-electron
 Exec=$HOME/discord-electron/electron-discord-webapp
-Icon=/home/pi/pi-apps/apps/Discord/icon-64.png
+Icon=$(dirname "$0")/icon-64.png
 Categories=Network;Chat;VideoConference;WebApp;Internet
 Comment=Your place to talk!
 GenericName=Network Messenger" > ~/.local/share/applications/discord.desktop
diff --git a/apps/Discord/install-64 b/apps/Discord/install-64
index 5345326..944b534 100755
--- a/apps/Discord/install-64
+++ b/apps/Discord/install-64
@@ -28,7 +28,7 @@ Type=Application
 Name=Discord
 Path=$HOME/discord-electron
 Exec=$HOME/discord-electron/electron-discord-webapp
-Icon=/home/pi/pi-apps/apps/Discord/icon-64.png
+Icon=$(doirname "$0")/icon-64.png
 Categories=Network;Chat;VideoConference;WebApp;Internet
 Comment=Your place to talk!
 GenericName=Network Messenger" > ~/.local/share/applications/discord.desktop
diff --git a/apps/FreeCAD (precompiled)/uninstall b/apps/FreeCAD (precompiled)/uninstall
index 98a286f..d54880a 100755
--- a/apps/FreeCAD (precompiled)/uninstall	
+++ b/apps/FreeCAD (precompiled)/uninstall	
@@ -8,6 +8,6 @@ function error {
 }
 "${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1
 
-sudo rm -f $(cat ~/freecad-build/install_manifest.txt) /home/pi/.local/share/applications/org.freecadweb.FreeCAD.desktop || error "failed to remove every installed file!"
+sudo rm -f $(cat ~/freecad-build/install_manifest.txt) ~/.local/share/applications/org.freecadweb.FreeCAD.desktop || error "failed to remove every installed file!"
 
-rm -rf ~/freecad-precompiled /home/pi/FreeCAD-0.18.4 || error "failed to remove both installation folders!"
+rm -rf ~/freecad-precompiled ~/FreeCAD-0.18.4 || error "failed to remove both installation folders!"
diff --git a/apps/FreeCAD/uninstall b/apps/FreeCAD/uninstall
index 830ca52..cc37505 100755
--- a/apps/FreeCAD/uninstall
+++ b/apps/FreeCAD/uninstall
@@ -9,6 +9,6 @@ function error {
 
 "${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1
 
-sudo rm -f $(cat ~/freecad-build/install_manifest.txt) /home/pi/.local/share/applications/org.freecadweb.FreeCAD.desktop || error "failed to remove every installed file!"
+sudo rm -f $(cat ~/freecad-build/install_manifest.txt) ~/.local/share/applications/org.freecadweb.FreeCAD.desktop || error "failed to remove every installed file!"
 
-rm -rf ~/freecad-build /home/pi/FreeCAD-0.18.4 || error "failed to remove both installation folders!"
+rm -rf ~/freecad-build ~/FreeCAD-0.18.4 || error "failed to remove both installation folders!"
diff --git a/apps/Minecraft Bedrock/install-32 b/apps/Minecraft Bedrock/install-32
index 4f6bd45..65636c2 100755
--- a/apps/Minecraft Bedrock/install-32	
+++ b/apps/Minecraft Bedrock/install-32	
@@ -21,9 +21,9 @@ Version=1.1
 Type=Application
 Name=Minecraft Bedrock Launcher
 Comment=A Minecraft: Bedrock Edition
-Icon=/home/pi/pi-apps/apps/Minecraft Bedrock/icon-64.png
+Icon=$(dirname "$0")/icon-64.png
 Exec=bash -c "GALLIUM_HUD=simple,fps /usr/bin/MCBedrock.AppImage"
 Categories=Game;
 Terminal=false
-StartupNotify=true' > /home/pi/.local/share/applications/minecraftbedrock.desktop
+StartupNotify=true' > ~/.local/share/applications/minecraftbedrock.desktop
 
diff --git a/apps/Scrcpy/install b/apps/Scrcpy/install
index 566acaf..a7a04dc 100755
--- a/apps/Scrcpy/install
+++ b/apps/Scrcpy/install
@@ -24,7 +24,7 @@ wget https://misapuntesde.com/rpi_share/scrcpy-1.13.tar.gz || error "Failed to d
 tar -xf scrcpy-1.13.tar.gz || error "Failed to extract!"
 rm scrcpy-1.13.tar.gz
 
-ln -s /usr/bin/adb /home/pi/scrcpy/
+ln -s /usr/bin/adb $HOME/scrcpy/
 
 sudo mkdir -p /usr/local/share/scrcpy
 sudo cp -af $HOME/scrcpy/scrcpy-server /usr/local/share/scrcpy/scrcpy-server