updates to add more themes and work on the theme directive with tests