some bootstrap changes
using theirs to merge
dependencies settings