Thunar+xfce (both "thunar" and "xfce" branches without conflicts)

If both of the prior pull requests are wanted, then take this one instead and close the other two -- this PR implements both branches without the inherent conflicts between the two.