After first attempt at merging with bootstrap theme