add fork support for gnome3/ and xfce/
Merge remote-tracking branch 'upstream/master'
add gnome3 and xfce fork-specific settings