more theme enhancements