diff --git a/debian.sh b/debian.sh
index c5f773e..9089ce2 100755
--- a/debian.sh
+++ b/debian.sh
@@ -54,7 +54,7 @@ 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 "
 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 "
+SHARED_DESKTOP_APPS=" firefox-esr yt-dlp keepassxc rssguard telegram-desktop gimp cinnamon 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"
@@ -65,6 +65,8 @@ 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/" /etc/lightdm/lightdm.conf
+    sed -i 's/#autologin-user-timeout=0/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
 }
 
 create-os-snapshots() {
@@ -476,7 +478,6 @@ server-config() {
     rm -f /etc/systemd/system/default.target
     ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
     systemctl isolate multi-user.target
-    apt remove gnome* gnome-* -y
     apt autoremove -y
 }