Updates for Scale and scale theming