Bug fixes and theme enhancements