diff --git a/main.ks b/main.ks
index 5c3e6ab..eed9e97 100644
--- a/main.ks
+++ b/main.ks
@@ -5,7 +5,7 @@ firewall --disabled
 firstboot --enabled
 
 # Enable/Disable services
-services --enabled=sddm,avahi-daemon,cpupower,irqbalance,dbus,sshd,cups,smb,wsdd,systemd-resolved,NetworkManager
+services --enabled=lightdm,avahi-daemon,cpupower,irqbalance,dbus,sshd,cups,smb,wsdd,systemd-resolved,NetworkManager
 
 # partition
 part / --size 12268 --fstype ext4
@@ -28,10 +28,12 @@ keyboard en
 
 %post
 
-# autologin sddm
-sed -e 's/^User=/User=live/' -i /etc/sddm.conf
-# default session 
-sed -e 's/^Session=/Session=lxqt.desktop/' -i /etc/sddm.conf
+# autologin lightdm and session default xfce
+sed -i 's/^#autologin-user=.*/autologin-user=live/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+sed -i 's/^#user-session=.*/user-session=xfce/' /etc/lightdm/lightdm.conf
+
+ln -sfr /etc/X11/xinit/xinitrc.d/50-systemd-user.sh /etc/X11/xinit.d
 
 ### Manually (re)generate initrds
 # TODO: move its generation from %%post to %%postrrans in kernel
@@ -71,3 +73,4 @@ find /boot -name 'initrd-*' -print
 ls -la $LIVE_ROOT/isolinux/
 cp -v "$(find "${INSTALL_ROOT}/boot" -name 'initrd-*.img' | sort -u | tail -n 1)" "${LIVE_ROOT}/isolinux/initrd0.img"
 %end
+
diff --git a/packages.ks b/packages.ks
index 526c6d6..b31bbc3 100644
--- a/packages.ks
+++ b/packages.ks
@@ -22,11 +22,10 @@ locales-de
 locales-fr
 locales-tr
 locales-pl
-
+lightdm
 git-core
 htop
 hw-probe
-hw-probe-gui
 iputils
 iproute2
 nano
@@ -40,7 +39,7 @@ task-printing
 task-scanning
 pulseaudio
 screen
-sddm
+#sddm
 xterm
 dbus-x11
 mc
@@ -69,7 +68,8 @@ gparted
 ntfs-3g
 xfsprogs
 sudo
-task-xfce
+task-xfce-minimal
+task-xfce-plugins
 tree
 quota
 udisks2