Revert "Revert e97e9b9..ec42d20"

This reverts commit 59166aa85d57fcef4c1abdb11fe423e90e98a72c.

Conflicts:

src/xpkg/xpkg.xcodeproj/project.xcworkspace/xcuserdata/jack.xcuserdatad/
UserInterfaceState.xcuserstate
updates