Theming enhancements