Merged in bootstrap theme