still more responsive theming