diff --git a/source/scripts/argon-shutdown.sh b/source/scripts/argon-shutdown.sh
index fdcd539..8867995 100644
--- a/source/scripts/argon-shutdown.sh
+++ b/source/scripts/argon-shutdown.sh
@@ -7,7 +7,10 @@ argonirconfigscript=/etc/argon/argonone-ir
 
 if [ ! -z "$1" ]
 then
-	$pythonbin $argononefanscript FANOFF
+	if [ -f "$argononefanscript" ]
+	then
+		$pythonbin $argononefanscript FANOFF
+	fi
 	if [ "$1" = "poweroff" ] || [ "$1" = "halt" ]
 	then
 		if [ -f $argonirconfigscript ]
diff --git a/source/scripts/argon-uninstall.sh b/source/scripts/argon-uninstall.sh
index 88e9e99..e296951 100644
--- a/source/scripts/argon-uninstall.sh
+++ b/source/scripts/argon-uninstall.sh
@@ -41,7 +41,10 @@ if [ -f "$shortcutfile" ]; then
 		sudo rm /usr/share/pixmaps/argoneon.png
 	fi
 fi
-
+shortcutfile="/home/$destfoldername/Desktop/argononeup.desktop"
+if [ -f "$shortcutfile" ]; then
+	sudo rm $shortcutfile
+fi
 
 INSTALLATIONFOLDER=/etc/argon
 
@@ -58,6 +61,15 @@ if [ -f $argononefanscript ]; then
 	sudo rm /lib/systemd/system/argononed.service
 fi
 
+argononeupscript=$INSTALLATIONFOLDER/argononeupd.py
+if [ -f $argononeupscript ]; then
+	sudo systemctl stop argononeupd.service
+	sudo systemctl disable argononeupd.service
+
+	# Remove files
+	sudo rm /lib/systemd/system/argononeupd.service
+fi
+
 # Remove RTC if any
 argoneonrtcscript=$INSTALLATIONFOLDER/argoneond.py
 if [ -f "$argoneonrtcscript" ]
@@ -78,7 +90,7 @@ fi
 argononeupsscript=$INSTALLATIONFOLDER/argononeupsd.py
 if [ -f "$argononeupsscript" ]
 then
-	sudo rmmod argonbatteryicon
+	#sudo rmmod argonbatteryicon
 	# Disable Services
 	sudo systemctl stop argononeupsd.service
 	sudo systemctl disable argononeupsd.service
@@ -98,18 +110,21 @@ then
 	done
 fi
 
-sudo rm /usr/bin/argon-config
+if [ -f "/usr/bin/argon-config" ]
+then
+	sudo rm /usr/bin/argon-config
+fi
 
 if [ -f "/usr/bin/argonone-config" ]
 then
-		sudo rm /usr/bin/argonone-config
-		sudo rm /usr/bin/argonone-uninstall
+	sudo rm /usr/bin/argonone-config
+	sudo rm /usr/bin/argonone-uninstall
 fi
 
 
 if [ -f "/usr/bin/argonone-ir" ]
 then
-		sudo rm /usr/bin/argonone-ir
+	sudo rm /usr/bin/argonone-ir
 fi
 
 # Delete config files
diff --git a/source/scripts/argon-versioninfo.sh b/source/scripts/argon-versioninfo.sh
index e10889d..02f5c0f 100644
--- a/source/scripts/argon-versioninfo.sh
+++ b/source/scripts/argon-versioninfo.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSIONINFO="2505003"
+VERSIONINFO="2506001"
 
 echo "Version $VERSIONINFO"
 if [ -z "$1" ]