diff --git a/debian.sh b/debian.sh
index a0a41d1..a6854d4 100755
--- a/debian.sh
+++ b/debian.sh
@@ -29,9 +29,9 @@ mkdir $TARGET
 ######################################
 echo
 HARD_DISK=$2
-EFI="/dev/$(lsblk | grep $HARD_DISK | head -2 | tail -1 | cut -c 7-20 | cut -d ' ' -f1)"
-BTRFS="/dev/$(lsblk | grep $HARD_DISK | head -4 | tail -1 | cut -c 7-20 | cut -d ' ' -f1)"
-BOOT="/dev/$(lsblk | grep $HARD_DISK | head -3 | tail -1 | cut -c 7-20 | cut -d ' ' -f1)"
+EFI="/dev/$(lsblk | grep $HARD_DISK | head -2 | tail -1 | sed 's/├─//' | cut -d ' ' -f1)"
+BTRFS="/dev/$(lsblk | grep $HARD_DISK | head -4 | tail -1 | sed 's/└─//'| cut -d ' ' -f1)"
+BOOT="/dev/$(lsblk | grep $HARD_DISK | head -3 | tail -1 | sed 's/├─//' | cut -d ' ' -f1)"
 ROOT_NAME='debian'
 ROOT_MAPPER_NAME='root'
 BACKUP_DISK='/dev/disk/by-uuid/da0af184-781f-49f8-bd3f-f3b869a08fcf'
@@ -53,9 +53,9 @@ AUTO_DECRYPT='True'
 FLATPAKS+=(app/net.brinkervii.grapejuice org.kde.kdenlive)
 
 #Packages
-PACKAGES=" minidlna libsecret-tools libglu1-mesa preload flatpak powertop blueman acpi neofetch cockpit cockpit-podman packagekit cockpit-packagekit cockpit-pcp cockpit-storaged redis "
+PACKAGES=" minidlna libsecret-tools libglu1-mesa preload flatpak powertop blueman acpi screenfetch 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=" gnome-system-monitor gnome-screenshot cinnamon lightdm shotwell yt-dlp keepassxc telegram-desktop gimp evolution nextcloud-desktop handbrake vlc libreoffice "
+SHARED_DESKTOP_APPS=" power-profiles-daemon kde-standard konsole dolphin kde-spectacle system-config-printer shotwell yt-dlp keepassxc telegram-desktop gimp nextcloud-desktop 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"
@@ -64,10 +64,15 @@ PACKAGES=$BASE_PACKAGES$PACKAGES$SHARED_DESKTOP_APPS
 SERVICES+=(powertop preload)
 
 auto_login() {
-    sed -i "/#WaylandEnable=false/a AutomaticLoginEnable=True" $TARGET/etc/gdm3/daemon.conf
-    sed -i "/True/a AutomaticLogin=$USER" $TARGET/etc/gdm3/daemon.conf
-    sed -i "s/#autologin-user=/autologin-user=$USER/" $TARGET/etc/lightdm/lightdm.conf
-    sed -i "s/#autologin-user-timeout=0/autologin-user-timeout=0/ " $TARGET/etc/lightdm/lightdm.conf
+    #sed -i "/#WaylandEnable=false/a AutomaticLoginEnable=True" $TARGET/etc/gdm3/daemon.conf
+    #sed -i "/True/a AutomaticLogin=$USER" $TARGET/etc/gdm3/daemon.conf
+    #sed -i "s/#autologin-user=/autologin-user=$USER/" $TARGET/etc/lightdm/lightdm.conf
+    #sed -i "s/#autologin-user-timeout=0/autologin-user-timeout=0/ " $TARGET/etc/lightdm/lightdm.conf
+    mkdir -p /etc/sddm.conf.d
+    echo "[Autologin]" > $TARGET/etc/sddm.conf.d/autologin
+    echo "User=$USER" >> $TARGET/etc/sddm.conf.d/autologin
+    echo "Session=plasma.desktop" >> $TARGET/etc/sddm.conf.d/autologin
+    echo "Relogin=false" >> $TARGET/etc/sddm.conf.d/autologin
 }
 
 create-os-snapshots() {
@@ -225,7 +230,7 @@ install-element() {
 
 additional-software() {
     install-vivaldi
-    install-brave
+    #install-brave
     install-element
     install-vscode
 }