enhancements and added theme option