Add desktop user tools
Merge branch 'add-pkgs'