merge bits from old default into new bootstrap theme
Make 'bootstrap' theme work