OZP-16: switcher theming progress