updates
updated coloring
Merge branch 'dev'

Conflicts:

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