Go through the templates in studio-theme-bamboo-plugin and update them with changes the bamboo team have made between 2.5.1 and 2.6.1. Remove the custom templates if they are no longer needed, and update the .ftl.orig files also in studio-theme-bamboo-plugin.

Most of them are out of date and causing layout / javascript issues.