Conflicts: tpl/bootstrap.php tpl/page.php And update SRI. @elrido also did not properly merge this branch. Doing it now…