diff --git a/setup.sh b/setup.sh
index 035ec480c098455565fa7d231099c00c85afa815..533cf16c01bed872858a662144817218a5866b01 100755
--- a/setup.sh
+++ b/setup.sh
@@ -26,6 +26,10 @@
 	sudo apt -qq update
 	sudo apt -qq upgrade -y -qq
 
+# Desktop Environment
+	echo "Installing Desktop Environment"
+	sudo apt -qq install -qq -y lxde-core lxappearance
+
 
 # create vnc users
 	echo "Creating VNC Users"
@@ -65,33 +69,36 @@
 	then
 		echo " Creating autostart service."
 
-		echo "[Unit]
-		Description=TightVNC remote desktop server
-		After=network.target
-		 
-		[Service]
-		User=pi
-		Type=forking
-		ExecStart=/usr/bin/vncserver :1 -geometry 1440x900
-		ExecStop=/usr/bin/vncserver -kill :1
-		 
-		[Install]
-		WantedBy=multi-user.target" > vncserver.service
+#		echo "[Unit]
+#		Description=TightVNC remote desktop server
+#		After=network.target
+#		 
+#		[Service]
+#		User=pi
+#		Type=forking
+#		ExecStart=/usr/bin/vncserver :1 -geometry 1440x900
+#		ExecStop=/usr/bin/vncserver -kill :1
+#		 
+#		[Install]
+#		WantedBy=multi-user.target" > vncserver.service
 		
+	for i in $(seq 1 $vncCount)
+	do
 		echo "[Unit]
-		Description=1 TightVNC remote desktop server
+		Description=$i TightVNC remote desktop server
 		After=syslog.target network.target
 		 
 		[Service]
-		User=pi1
+		User=pi$i
 		Type=forking
-		PIDFile=/home/pi1/.vnc/%H:2.pid
-		ExecStartPre=-/usr/bin/vncserver -kill :2 > /dev/null 2>&1
-		ExecStart=/usr/bin/vncserver :2 -depth 16 -geometry 1600x800
-		ExecStop=/usr/bin/vncserver -kill :2
+		PIDFile=/home/pi$i/.vnc/%H:$i.pid
+		ExecStartPre=-/usr/bin/vncserver -kill :$i > /dev/null 2>&1
+		ExecStart=/usr/bin/vncserver :$i -depth 16 -geometry 1600x800
+		ExecStop=/usr/bin/vncserver -kill :$i
 		
 		[Install]
-		WantedBy=multi-user.target" > vncserver1.service
+		WantedBy=multi-user.target" > vncserver$i.service
+#	done
 		
 #		echo "[Unit]
 #		Description=Start TightVNC server at startup
@@ -108,25 +115,30 @@
 #		[Install]
 #		WantedBy=multi-user.target" > vncserver.service
 		
-		sudo mv vncserver.service /etc/systemd/system/vncserver.service
-		sudo mv vncserver1.service /etc/systemd/system/vncserverA.service
+#		sudo mv vncserver.service /etc/systemd/system/vncserver.service
+		sudo mv vncserver$i.service /etc/systemd/system/vncserver$i.service
+	done
 		sudo systemctl daemon-reload
 	else
 		echo " Autostart service already present."
 	fi
 
 	echo " Testing service:"
-	sudo systemctl start vncserver
-	sudo systemctl start vncserverA
-	VNC=$(systemctl status vncserverA | grep -e "Active: active (running)")
+	for i in $(seq 1 $vncCount)
+	do
+		sudo systemctl start vncserver$i
+	done
+	VNC=$(systemctl status vncserver1 | grep -e "Active: active (running)")
 	if [ "$VNC" ]
 	then
 		echo " Sucessful, enabling service!"
-		sudo systemctl enable vncserver
-		sudo systemctl enable vncserverA
+		for i in $(seq 1 $vncCount)
+		do
+			sudo systemctl enable vncserver$i
+		done
 	else
 		echo "!Something went wrong! See status:"
-		systemctl status vncserverA | cat
+		systemctl status vncserver1 | cat
 	fi
 
 
@@ -149,6 +161,7 @@
 
 # Install user software
 	echo "Installing letsgoING ArduinoControl"
+	sudo apt -qq install -qq -y python3-pip python3-tk
 	sudo -H python3 -m pip install -q letsgoing-rpi-arduinocontrol
 	
 	echo "Installing Arduino IDE."
@@ -157,7 +170,7 @@
 # Create Shortcuts
 	echo "Creating desktop and start menu shortcuts for ArduinoControl."
 
-	wget -qO- http://letsgoing.org/img/personen/SMack.jpg > /home/pi/Downloads/SMack.jpg
+	wget -qO- http://letsgoing.org/img/personen/SMack.jpg > /home/pi/SMack.jpg
 
 	echo "[Desktop Entry]
 	Encoding=UTF-8
@@ -165,7 +178,7 @@
 	Name=Arduino Control
 	Exec=letsgoing-rpi-arduinocontrol
 	Comment=Control your Arduino from here!
-	Icon=/home/pi/Downloads/SMack.jpg
+	Icon=/home/pi/SMack.jpg
 	Terminal=false
 	Categories=Development;Engineering;Electronics" > arduinocontrol.desktop