Refactored to be in sync with master
[imp] keep original bootstrap files as much as possible
Merge pull request #4 from phproberto/jux-16-topbar

[imp] keep original bootstrap files as much as possible
Merge remote-tracking branch 'remotes/origin/jux-topbar' into jux-titlebar