Fix xfce gui autodetection
Various improvments regarding the CLI mode