Added support for XFCE and Cinnamon.  Split out identification and lowered CPU load