More theme enhancements