diff --git a/debian.sh b/debian.sh
index 3dcb3f9..cb4fc49 100755
--- a/debian.sh
+++ b/debian.sh
@@ -54,13 +54,14 @@ AUTO_DECRYPT='True'
 FLATPAKS+=( app/net.brinkervii.grapejuice org.kde.kdenlive )
 
 #Packages
-PACKAGES=" minidlna libsecret-tools libglu1-mesa preload apt-transport-https zram-tools samba samba-common nfs-common nfs-kernel-server linux-cpupower locales redis cockpit cockpit-podman flatpak powertop blueman cups acpi packagekit cockpit-packagekit cockpit-pcp cockpit-storaged 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 redis neofetch fuse3 build-essential unzip bash-completion parted dosfstools wget curl "
-SHARED_DESKTOP_APPS=" firefox-esr yt-dlp keepassxc rssguard telegram-desktop gnome-core gimp gnome-tweaks evolution nextcloud-desktop gnome-photos handbrake vlc libreoffice "
+PACKAGES=" minidlna libsecret-tools libglu1-mesa preload flatpak powertop blueman acpi neofetch cockpit cockpit-podman packagekit cockpit-packagekit cockpit-pcp cockpit-storaged redis "
+BASE_PACKAGES=" 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 yt-dlp keepassxc rssguard telegram-desktop gnome gimp gnome-tweaks evolution nextcloud-desktop gnome-photos handbrake vlc libreoffice "
 #Removed for Debian Bullseye. Works on Bookworm
 #REMOVED="  aardvark-dns podman-compose podman-toolbox "
 VIRTUALIZATION=" virt-manager qemu-system libvirt-daemon-system ovmf cockpit-machines"
-
-PACKAGES=$PACKAGES$SHARED_DESKTOP_APPS
+PACKAGES=$BASE_PACKAGES$PACKAGES$SHARED_DESKTOP_APPS
+#PACKAGES=$BASE_PACKAGES
 SERVICES+=( powertop preload );
 
 auto_login(){
@@ -68,7 +69,7 @@ auto_login(){
     sed -i "/True/a AutomaticLogin=$USER" $TARGET/etc/gdm3/daemon.conf
 }
 
-create-smb-snapshots(){
+create-os-snapshots(){
     echo;echo "[Creating new snapshots.....]";echo
     time tar cvpzf $TARGET/$1.tgz --exclude=/volumes/* --exclude=/mnt/* --exclude=/var/tmp/* --exclude=/tmp/* --exclude=/raid/* --exclude=/root/* --exclude=/var/cache/apt/archives/* --exclude=/proc/* --exclude=/.snapshots/* --exclude=$TARGET/* --exclude=/var/lib/libvirt/* --exclude=/dev/* --exclude=/sys/* --exclude=/home/* --exclude=/var/lib/postgresql --exclude=/var/lib/containers  / 
 }
@@ -78,7 +79,7 @@ homeBackup() {
     rsync --progress -avz --delete /home/ --exclude=.cache/ --exclude=.local/share/containers/ $HOME_BACKUP/ 
 }
 
-net-backup() {
+os-backup() {
     umount $TARGET
 
     echo;echo "[Mounting.....]";echo
@@ -88,13 +89,12 @@ net-backup() {
         homeBackup
     fi
     
-    create-smb-snapshots "$1"
-    cp -f debian.sh $TARGET/
+    create-os-snapshots "$1"
     ls $TARGET/
     umount $TARGET
 }
 
-net-restore() {
+os-restore() {
     partitions
     rm -rf $TARGET/usr $TARGET/sbin $TARGET/lib32 $TARGET/libx32 $TARGET/lib $TARGET/vmlinuz* $TARGET/initrd* $TARGET/bin $TARGET/var $TARGET/root $TARGET/opt $TARGET/etc $TARGET/run 
     tar xfpv $2.tgz -C $TARGET/
@@ -154,17 +154,10 @@ install-element(){
     apt update;apt install -y element-desktop
 }
 
-install-vivaldi(){
-    wget -qO- https://repo.vivaldi.com/archive/linux_signing_key.pub | gpg --dearmor | dd of=/usr/share/keyrings/vivaldi-browser.gpg
-    echo "deb [signed-by=/usr/share/keyrings/vivaldi-browser.gpg arch=$(dpkg --print-architecture)] https://repo.vivaldi.com/archive/deb/ stable main" | dd of=/etc/apt/sources.list.d/vivaldi-archive.list
-    apt update && apt install vivaldi-stable -y
-}
-
 additional-software(){
     install-element
     install-doom
     install-vscode
-    #install-vivaldi
 }
 
 configure-repository(){
@@ -509,11 +502,11 @@ elif [ "$1" = "wifi" ]; then
 elif [ "$1" = "flatpaks" ]; then
     flatpaks
 elif [ "$1" = "bootloader" ]; then
-    bootloader
+    bootloader "$1"
 elif [ "$1" = "snapshot" ]; then
     snapshots
 elif [ "$1" = "backup" ]; then
-    net-backup "$2" "$3"
+    os-backup "$2" "$3"
 elif [ "$1" = "server-config" ]; then
     server-config
 elif [ "$1" = "grub-snapshots" ]; then
@@ -521,7 +514,7 @@ elif [ "$1" = "grub-snapshots" ]; then
 elif [ "$1" = "btrfs-tweaks" ]; then
     btrfs-tweaks
 elif [ "$1" = "restore" ]; then
-    net-restore "$2" "$3" "$4"
+    os-restore "$2" "$3" "$4"
 elif [ "$1" = "remove-snapshot" ]; then
     remove-snapshots
 elif [ "$1" = "help" ]; then