merging changes from new theme with bootstrap3 and further
customisations