Also removed the custom theme base template as they is very little different, and with the theme upgrade, easier to maintain. If we need any customisation we can instead customise specific blocks with in the template.