diff --git a/debian.sh b/debian.sh
index 20e89ba..13b10a3 100755
--- a/debian.sh
+++ b/debian.sh
@@ -47,17 +47,15 @@ SSID='123456'
 WIRELESS_INTERFACE='wlan0'
 DISK_PASSWORD='123456'
 COMPRESSION='compress=zlib:5'
-DEBIAN_RELEASE='stable'
-CURRENT_STABLE_NAME='bullseye'
+DEBIAN_RELEASE='bookworm'
 AUTO_DECRYPT='True'
-FLATPAKS+=(net.sourceforge.chromium-bsu io.jor.mightymike com.eduke32.EDuke32 com.zandronum.Zandronum net.openra.OpenRA)
+FLATPAKS+=( org.kde.kapman net.sourceforge.ExtremeTuxRacer com.github.bjaraujo.Bombermaaan org.supertuxproject.SuperTux net.supertuxkart.SuperTuxKart net.sourceforge.chromium-bsu io.jor.mightymike com.eduke32.EDuke32 com.zandronum.Zandronum net.openra.OpenRA)
 
 #Packages
-PACKAGES=" nmap minidlna libsecret-tools libglu1-mesa preload flatpak powertop acpi cockpit cockpit-podman packagekit cockpit-packagekit cockpit-pcp cockpit-storaged "
-BASE_PACKAGES=" btop shfmt cups apt-transport-https samba samba-common nfs-common nfs-kernel-server linux-cpupower locales zram-tools acpid podman ghostscript cifs-utils ntp vim-airline rsync screen base udev git network-manager efibootmgr linux-headers-amd64 cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat fuse3 build-essential unzip bash-completion parted dosfstools wget curl "
-SHARED_DESKTOP_APPS=" kwin-addons power-profiles-daemon kde-standard konsole dolphin kde-spectacle print-manager digikam yt-dlp keepassxc telegram-desktop krita nextcloud-desktop handbrake calligra "
-#Removed for Debian Bullseye. Works on Bookworm
-#REMOVED=" aardvark-dns podman-compose podman-toolbox "
+PACKAGES=" podman-toolbox nmap minidlna libsecret-tools libglu1-mesa preload flatpak powertop acpi cockpit cockpit-podman packagekit cockpit-packagekit cockpit-storaged "
+BASE_PACKAGES=" aardvark-dns podman-compose btop shfmt cups apt-transport-https samba samba-common nfs-common nfs-kernel-server linux-cpupower locales zram-tools acpid podman ghostscript cifs-utils ntp vim-airline rsync screen base udev git network-manager efibootmgr linux-headers-amd64 cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat fuse3 build-essential unzip bash-completion parted dosfstools wget curl "
+SHARED_DESKTOP_APPS=" firefox-esr kwin-addons power-profiles-daemon kde-standard konsole dolphin kde-spectacle print-manager digikam yt-dlp keepassxc telegram-desktop krita nextcloud-desktop handbrake calligra "
+#REMOVED=" cockpit-pcp  "
 VIRTUALIZATION=" virt-manager qemu-system libvirt-daemon-system ovmf cockpit-machines"
 PACKAGES=$BASE_PACKAGES$PACKAGES$SHARED_DESKTOP_APPS
 #PACKAGES=$BASE_PACKAGES
@@ -242,7 +240,7 @@ install-tor() {
 
 additional-software() {
 	install-tor
-	install-vivaldi
+	#install-vivaldi
 	#install-brave
 	install-element
 	#install-vscode
@@ -256,13 +254,13 @@ configure-repository() {
 		chroot $TARGET /usr/bin/apt update
 		chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt install -y $PACKAGES"
 	else
-		echo "deb https://deb.debian.org/debian $DEBIAN_RELEASE main contrib non-free" >$TARGET/etc/apt/sources.list
+		echo "deb https://deb.debian.org/debian $DEBIAN_RELEASE main contrib non-free non-free-firmware" >$TARGET/etc/apt/sources.list
 		echo "deb https://deb.debian.org/debian-security $DEBIAN_RELEASE-security main" >>$TARGET/etc/apt/sources.list
 		echo "deb https://deb.debian.org/debian $DEBIAN_RELEASE-updates main " >>$TARGET/etc/apt/sources.list
-		echo "deb https://deb.debian.org/debian $CURRENT_STABLE_NAME-backports main" >>$TARGET/etc/apt/sources.list
+		echo "deb https://deb.debian.org/debian $DEBIAN_RELEASE-backports main" >>$TARGET/etc/apt/sources.list
 		chroot $TARGET /usr/bin/apt update
 		chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt install -y $PACKAGES"
-		chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt dist-upgrade -y -t $CURRENT_STABLE_NAME-backports"
+		chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt dist-upgrade -y -t $DEBIAN_RELEASE-backports"
 		chroot $TARGET /usr/bin/bash -c "export DEBIAN_FRONTEND=noninteractive;/usr/bin/apt auto-remove -y"
 	fi