Adding some more themes, etc.