diff --git a/main/setup.sh b/main/setup.sh
index 0ea4bb5..a514f62 100755
--- a/main/setup.sh
+++ b/main/setup.sh
@@ -10,6 +10,8 @@ JF_VERSION=1.12.0
 LINUX_VERSION=trixie
 PROTON_VERSION=2.15.1
 KRITA_VERSION=5.3.2.1
+JAVA_VERSION=25
+RUSTDESK=1.4.8
 
 echo " "
 echo "INFO ! checking for & installing updates & Core things."
@@ -30,24 +32,33 @@ echo " "
 echo "INFO ! utillities."
 echo " "
 # apt-get install --no-install-recommends -y ttf-mscorefonts-installer
-# apt-get install --no-install-recommends -y putty
+apt-get install --no-install-recommends -y putty
 # apt-get install --no-install-recommends -y nextcloud-desktop
-# apt-get install --no-install-recommends -y syncthing
+apt-get install --no-install-recommends -y syncthing
 apt-get install --no-install-recommends -y htop
 apt-get install --no-install-recommends -y iftop
 apt-get install --no-install-recommends -y fastfetch
-# apt-get install --no-install-recommends -y gparted
+apt-get install --no-install-recommends -y gparted
 apt-get install --no-install-recommends -y keepassxc
 apt-get install --no-install-recommends -y filezilla
 apt-get install --no-install-recommends -y curl
-# apt-get install --no-install-recommends -y chirp
-# apt-get install --no-install-recommends -y satdump
-# apt-get install --no-install-recommends -y rustdesk
+apt-get install --no-install-recommends -y chirp
+apt-get install --no-install-recommends -y satdump
 apt-get install --no-install-recommends -y lightdm-settings
 apt-get install --no-install-recommends -y gnome-calendar
 apt-get install --no-install-recommends -y libfuse2t64
 apt-get install --no-install-recommends -y tar
-# apt-get install --no-install-recommends -y openvpn network-manager-openvpn network-manager-openvpn-gnome
+
+if dpkg -s rustdesk &> /dev/null
+	then
+		echo "INFO ! rustdesk-${RUSTDESK}-x86_64 installed ... moving on."
+	else
+		echo " "
+		echo "WARNING ! rustdesk-${RUSTDESK}-x86_64 not installed ... will install now."
+		wget --no-cache --show-progress --progress=bar:force:noscroll "https://github.com/rustdesk/rustdesk/releases/download/1.4.8/rustdesk-${RUSTDESK}-x86_64.deb" -O rustdesk-${RUSTDESK}-x86_64.deb
+		dpkg -i rustdesk-${RUSTDESK}-x86_64.deb
+		rm -fr rustdesk-${RUSTDESK}-x86_64.deb
+fi
 
 # echo " "
 # echo "INFO ! Installing MakeMKV-${MAKEMKV_VERSION} & utillities."
@@ -85,9 +96,9 @@ echo "INFO ! Codeing things."
 echo " "
 # apt-get install --no-install-recommends -y docker docker.io docker-compose docker-clean docker-registry
 apt-get install --no-install-recommends -y git
-# apt-get install --no-install-recommends -y gh
-# apt-get install --no-install-recommends -y arduino
-# apt-get install --no-install-recommends -y adb
+apt-get install --no-install-recommends -y gh
+apt-get install --no-install-recommends -y arduino
+apt-get install --no-install-recommends -y adb
 apt-get install --no-install-recommends -y python3
 
 # if dpkg -s code &> /dev/null
@@ -116,55 +127,53 @@ fi
 echo " "
 echo "INFO ! Media things."
 echo " "
-# apt-get install --no-install-recommends -y audacity
+apt-get install --no-install-recommends -y audacity
 apt-get install --no-install-recommends -y vlc
-# apt-get install --no-install-recommends -y obs-studio
-# apt-get install --no-install-recommends -y kdenlive
+apt-get install --no-install-recommends -y obs-studio
+apt-get install --no-install-recommends -y kdenlive
 apt-get install --no-install-recommends -y gimp
-# apt-get install --no-install-recommends -y inkscape
-# apt-get install --no-install-recommends -y asunder
+apt-get install --no-install-recommends -y inkscape
+apt-get install --no-install-recommends -y asunder
 
-if dpkg -s jellyfin-${JF_VERSION_TYPE} &> /dev/null
-	then
-		echo "INFO ! jellyfin-${JF_VERSION_TYPE} installed ... moving on."
-	else
-		echo " "
-		echo "WARNING ! jellyfin-${JF_VERSION_TYPE} not installed ... will install now."
-		wget --no-cache --show-progress --progress=bar:force:noscroll "https://github.com/jellyfin/jellyfin-desktop/releases/download/v${JF_VERSION}/jellyfin-${JF_VERSION_TYPE}_${JF_VERSION}-${LINUX_VERSION}.deb" -O jellyfin-${JF_VERSION_TYPE}_${JF_VERSION}-${LINUX_VERSION}.deb
-		dpkg -i jellyfin-${JF_VERSION_TYPE}_${JF_VERSION}-${LINUX_VERSION}.deb
-		rm -fr jellyfin-${JF_VERSION_TYPE}_${JF_VERSION}-${LINUX_VERSION}.deb
-fi
-
-# if [ -e /home/${USER}/krita-${KRITA_VERSION}-x86_64.AppImage ]
+# if dpkg -s jellyfin-${JF_VERSION_TYPE} &> /dev/null
 # 	then
-# 		echo "INFO ! krita-${KRITA_VERSION}-x86_64.AppImage installed ... moving on."
+# 		echo "INFO ! jellyfin-${JF_VERSION_TYPE} installed ... moving on."
 # 	else
 # 		echo " "
-# 		echo "WARNING ! krita-${KRITA_VERSION}-x86_64.AppImage not installed ... will install now."
-# 		rm -fr /home/${USER}/krita-*-x86_64.AppImage
-# 		wget --no-cache --show-progress --progress=bar:force:noscroll "https://download.kde.org/stable/krita/${KRITA_VERSION}/krita-${KRITA_VERSION}-x86_64.AppImage" -O /home/${USER}/krita-${KRITA_VERSION}-x86_64.AppImage
-# 		chown ${USER} /home/${USER}/krita-${KRITA_VERSION}-x86_64.AppImage
-# 		chmod +x /home/${USER}/krita-${KRITA_VERSION}-x86_64.AppImage
-
-# 		tee /home/${USER}/Desktop/krita.desktop <<-EOF
-# 		[Desktop Entry]
-# 		Type=Application
-# 		Name=Krita
-# 		Exec=/home/$USER/krita-$KRITA_VERSION-x86_64.AppImage
-# 		Icon=cinnamon-panel-launcher
-# 		Terminal=false
-# 		EOF
-		
-# 		chown ${USER} /home/${USER}/Desktop/krita.desktop
-# 		chmod +x /home/${USER}/Desktop/krita.desktop
+# 		echo "WARNING ! jellyfin-${JF_VERSION_TYPE} not installed ... will install now."
+# 		wget --no-cache --show-progress --progress=bar:force:noscroll "https://github.com/jellyfin/jellyfin-desktop/releases/download/v${JF_VERSION}/jellyfin-${JF_VERSION_TYPE}_${JF_VERSION}-${LINUX_VERSION}.deb" -O jellyfin-${JF_VERSION_TYPE}_${JF_VERSION}-${LINUX_VERSION}.deb
+# 		dpkg -i jellyfin-${JF_VERSION_TYPE}_${JF_VERSION}-${LINUX_VERSION}.deb
+# 		rm -fr jellyfin-${JF_VERSION_TYPE}_${JF_VERSION}-${LINUX_VERSION}.deb
 # fi
 
-# echo " "
-# echo "INFO ! Moddeling/3D Printing stuff."
-# echo " "
-# apt-get install --no-install-recommends -y blender
-# apt-get install --no-install-recommends -y freecad
-# apt-get install --no-install-recommends -y cura
+if [ -e /home/${USER}/krita-${KRITA_VERSION}-x86_64.AppImage ]
+	then
+		echo "INFO ! krita-${KRITA_VERSION}-x86_64.AppImage installed ... moving on."
+	else
+		echo " "
+		echo "WARNING ! krita-${KRITA_VERSION}-x86_64.AppImage not installed ... will install now."
+		wget --no-cache --show-progress --progress=bar:force:noscroll "https://download.kde.org/stable/krita/${KRITA_VERSION}/krita-${KRITA_VERSION}-x86_64.AppImage" -O /home/${USER}/krita-${KRITA_VERSION}-x86_64.AppImage
+		chown ${USER} /home/${USER}/krita-${KRITA_VERSION}-x86_64.AppImage
+		chmod +x /home/${USER}/krita-${KRITA_VERSION}-x86_64.AppImage
+
+		tee /home/${USER}/Desktop/krita.desktop <<-EOF
+		[Desktop Entry]
+		Type=Application
+		Name=Krita
+		Exec=/home/${USER}/krita-${KRITA_VERSION}-x86_64.AppImage
+		Icon=cinnamon-panel-launcher
+		Terminal=false
+		EOF
+		chown ${USER} /home/${USER}/Desktop/krita.desktop
+		chmod +x /home/${USER}/Desktop/krita.desktop
+fi
+
+echo " "
+echo "INFO ! Moddeling/3D Printing stuff."
+echo " "
+apt-get install --no-install-recommends -y blender
+apt-get install --no-install-recommends -y freecad
+apt-get install --no-install-recommends -y cura
 
 echo " "
 echo "INFO ! Browsers."
@@ -186,7 +195,7 @@ if dpkg -s brave-browser &> /dev/null
 	else
 		echo " "
 		echo "WARNING ! Brave not installed ... will install now."
-        curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg
+		curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg
 		curl -fsSLo /etc/apt/sources.list.d/brave-browser-release.sources https://brave-browser-apt-release.s3.brave.com/brave-browser.sources
 		apt -y update
 		apt-get install --no-install-recommends -y brave-browser
@@ -216,39 +225,39 @@ echo " "
 echo "INFO ! Java"
 echo " "
 ## Microsoft
-# if dpkg -s msopenjdk-21 &> /dev/null
+# if dpkg -s msopenjdk-${JAVA_VERSION} &> /dev/null
 # 	then
-# 		echo "INFO ! msopenjdk-21 installed ... moving on."
+# 		echo "INFO ! msopenjdk-${JAVA_VERSION} installed ... moving on."
 # 	else
 # 		echo " "
-# 		echo "WARNING ! msopenjdk-21 not installed ... will install now."
+# 		echo "WARNING ! msopenjdk-${JAVA_VERSION} not installed ... will install now."
 # 		apt-get update
 # 		apt-get install --no-install-recommends -y wget lsb-release
 # 		wget https://packages.microsoft.com/config/debian/$(lsb_release -rs)/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
 # 		dpkg -i packages-microsoft-prod.deb
 # 		rm -fr packages-microsoft-prod.deb
 # 		apt-get update
-# 		apt-get install --no-install-recommends -y msopenjdk-21
+# 		apt-get install --no-install-recommends -y msopenjdk-${JAVA_VERSION}
 # fi
 
 ## Open JDK
-if dpkg -s openjdk-21-jdk-headless &> /dev/null
+if dpkg -s openjdk-${JAVA_VERSION}-jdk-headless &> /dev/null
 	then
-		echo "INFO ! openjdk-21-jdk-headless installed ... moving on."
+		echo "INFO ! openjdk-${JAVA_VERSION}-jdk-headless installed ... moving on."
 	else
 		echo " "
-		echo "WARNING ! openjdk-21-jdk-headless not installed ... will install now."
-		apt-get install --no-install-recommends -y openjdk-21-jdk-headless
+		echo "WARNING ! openjdk-${JAVA_VERSION}-jdk-headless not installed ... will install now."
+		apt-get install --no-install-recommends -y openjdk-${JAVA_VERSION}-jdk-headless
 fi
 
 ## Open JRE
-# if dpkg -s openjdk-21-jre-headless &> /dev/null
+# if dpkg -s openjdk-${JAVA_VERSION}-jre-headless &> /dev/null
 # 	then
-# 		echo "INFO ! openjdk-21-jre-headless installed ... moving on."
+# 		echo "INFO ! openjdk-${JAVA_VERSION}-jre-headless installed ... moving on."
 # 	else
 # 		echo " "
-# 		echo "WARNING ! openjdk-21-jre-headless not installed ... will install now."
-# 		apt-get install --no-install-recommends -y openjdk-21-jre-headless
+# 		echo "WARNING ! openjdk-${JAVA_VERSION}-jre-headless not installed ... will install now."
+# 		apt-get install --no-install-recommends -y openjdk-${JAVA_VERSION}-jre-headless
 # fi
 
 echo " "
@@ -298,7 +307,7 @@ if [ -e /home/${USER}/ProtonUp-Qt-${PROTON_VERSION}-x86_64.AppImage ]
 		[Desktop Entry]
 		Type=Application
 		Name=ProtonUp-QT
-		Exec=/home/$USER/ProtonUp-Qt-$PROTON_VERSION-x86_64.AppImage
+		Exec=/home/${USER}/ProtonUp-Qt-${PROTON_VERSION}-x86_64.AppImage
 		Icon=cinnamon-panel-launcher
 		Terminal=false
 		EOF
@@ -333,7 +342,7 @@ if [ -e /home/${USER}/TeamSpeak3-Client-linux_amd64 ]
 		[Desktop Entry]
 		Type=Application
 		Name=TeamSpeak
-		Exec=/home/$USER/TeamSpeak3-Client-linux_amd64/ts3client_runscript.sh
+		Exec=/home/${USER}/TeamSpeak3-Client-linux_amd64/ts3client_runscript.sh
 		Icon=teamspeak-client
 		Terminal=false
 		EOF