diff --git a/apps/Arduino/install-32 b/apps/Arduino/install-32
index af05aa1..e14dbda 100755
--- a/apps/Arduino/install-32
+++ b/apps/Arduino/install-32
@@ -7,12 +7,13 @@ function error {
   exit 1
 }
 
+cd ~/.local/share
+rm -f arduino-1.8.13-linuxarm.tar.xz
 wget https://downloads.arduino.cc/arduino-1.8.13-linuxarm.tar.xz || error "failed to download!"
 
 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!"
+arduino-1.8.13/install.sh || error "failed to run install as $USER user!"
 sudo arduino-1.8.13/install.sh || error "failed run install as root user!"
 
-rm $HOME/Desktop/arduino-arduinoide.desktop
-rm arduino-1.8.13-linuxarm.tar.xz
+rm -f $HOME/Desktop/arduino-arduinoide.desktop arduino-1.8.13-linuxarm.tar.xz
 exit 0
diff --git a/apps/Arduino/install-64 b/apps/Arduino/install-64
index 3242565..0412570 100755
--- a/apps/Arduino/install-64
+++ b/apps/Arduino/install-64
@@ -7,12 +7,13 @@ function error {
   exit 1
 }
 
+cd ~/.local/share
+rm -f arduino-1.8.13-linuxaarch64.tar.xz
 wget https://downloads.arduino.cc/arduino-1.8.13-linuxaarch64.tar.xz || error "failed to download!"
 
 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!"
+arduino-1.8.13/install.sh || error "failed to run install as $USER user!"
 sudo arduino-1.8.13/install.sh || error "failed run install as root user!"
 
-rm $HOME/Desktop/arduino-arduinoide.desktop
-rm arduino-1.8.13-linuxaarch64.tar.xz
+rm -f $HOME/Desktop/arduino-arduinoide.desktop arduino-1.8.13-linuxaarch64.tar.xz
 exit 0
diff --git a/apps/Arduino/uninstall b/apps/Arduino/uninstall
index 6d334cc..313113d 100755
--- a/apps/Arduino/uninstall
+++ b/apps/Arduino/uninstall
@@ -1,4 +1,15 @@
 #!/bin/bash
-arduino-1.8.13/uninstall.sh
-sudo arduino-1.8.13/uninstall.sh
-rm -rf arduino-1.8.13
+
+DIRECTORY="$(dirname "$(dirname "$( cd "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )")")"
+
+function error {
+  echo -e "\\e[91m$1\\e[39m"
+  exit 1
+}
+
+cd ~/.local/share
+
+arduino-1.8.13/uninstall.sh || error "Failed to run uninstall.sh as $USER user"
+sudo arduino-1.8.13/uninstall.sh || error "Failed to run uninstall.sh as root user"
+rm -rf arduino-1.8.13 || error "Failed to remove arduino-1.8.13 folder"
+