Note to self – If you want to survive major version cms upgrades, always use theme inheritance and overwrite defaults of the default theme that comes with Magento. I wish I knew … See also – Designer’s guide to Magento