Changes to support new theme