Revert "revert several commits for expanded desktop support"

This reverts commit 1368deea2e45b02f8337f260b79a2f2ae938e931.