Added better XFCE support plus screnn lock