xprofile: move hsetroot to xinitrc
xprofile: merge the two $DESKTOP_SESSION cases again