Update bootstrap template to be more inline with upstream