For that last bit, I was suggesting that you file-compare the /templates/bootstrap/templates against templates/template_default/templates to ensure that any template-overrides for the OPC templates have all the current changes.