diff --git a/argon-uninstall.sh b/argon-uninstall.sh
index 531ee21..cee1453 100755
--- a/argon-uninstall.sh
+++ b/argon-uninstall.sh
@@ -37,7 +37,7 @@ if [ -f $argononefanscript ]; then
 	sudo systemctl disable argononed.service
 
 	# Turn off the fan
-	/usr/bin/python3 $argononefanscript FANOFF
+	sudo /usr/bin/python3 $argononefanscript FANOFF
 
 	# Remove files
 	sudo rm /lib/systemd/system/argononed.service
@@ -52,8 +52,8 @@ then
 	sudo systemctl disable argoneond.service
 
 	# No need for sudo
-	/usr/bin/python3 $argoneonrtcscript CLEAN
-	/usr/bin/python3 $argoneonrtcscript SHUTDOWN
+	sudo /usr/bin/python3 $argoneonrtcscript CLEAN
+	sudo /usr/bin/python3 $argoneonrtcscript SHUTDOWN
 
 	# Remove files
 	sudo rm /lib/systemd/system/argoneond.service
@@ -68,6 +68,11 @@ then
 		sudo rm /usr/bin/argonone-ir
 fi
 
+if [ -f "/usr/bin/argon-status" ]
+then
+		sudo rm /usr/bin/argon-status
+fi
+
 sudo rm /lib/systemd/system-shutdown/argon-shutdown.sh
 
 sudo rm -R -f $INSTALLATIONFOLDER
diff --git a/argoneon.sh b/argoneon.sh
old mode 100644
new mode 100755
index 581874f..2bfd049
--- a/argoneon.sh
+++ b/argoneon.sh
@@ -10,7 +10,8 @@ INSTALLATIONFOLDER=/etc/argon
 
 uninstallscript=$INSTALLATIONFOLDER/argon-uninstall.sh
 shutdownscript=/lib/systemd/system-shutdown/argon-shutdown.sh
-statusscript=$INSTALLATIONFOLDER/argon-status.sh
+statusscript=$INSTALLATIONFOLDER/argon-status.py
+statuscmd=argon-status
 configscript=$INSTALLATIONFOLDER/argon-config
 
 setupmode="Setup"
@@ -198,9 +199,13 @@ sudo curl -L $ARGONDOWNLOADSERVER/argon-shutdown.sh -o $shutdownscript --silent
 sudo chmod 755 $shutdownscript
 
 # Argon Status script
-sudo curl -L $ARGONDOWNLOADSERVER/argon-status.sh -o $statusscript --silent
+sudo curl -L $ARGONDOWNLOADSERVER/argon-status.py -o $statusscript --silent
 sudo chmod 755 $statusscript
-sudo ln -s $statusscript /usr/bin/argon-status
+if [ -f /usr/bin/$statuscmd ]
+then
+    sudo rm /usr/bin/$statuscmd
+fi
+sudo ln -s $statusscript /usr/bin/$statuscmd
 
 # Argon Config Script
 if [ -f $configscript ]; then