further changes to sb theming