Adding some themes, and minor improvements